]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ddbf67e) | patch
Add IndexDiff tests for merge conflict state BOTH_ADDED 85/30585/5
authorLaurent Goubet <laurent.goubet@obeo.fr>
Mon, 28 Jul 2014 12:27:05 +0000 (14:27 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Sat, 2 Aug 2014 21:36:31 +0000 (23:36 +0200)
commit1fd150d565c10da901784071c2d82319a3fd8be4
treecd8f3d85c448d70009bf4c1798a6b9fecaf44afctree | snapshot
parentddbf67e0588379f2a063cf57b1d3ca926b43e63dcommit | diff
Add IndexDiff tests for merge conflict state BOTH_ADDED

JGit handled this case improperly which these tests demonstrate. Fixed
by I25915880f304090fe90584c79bddf021231227a2.

Bug: 440537
Change-Id: Ia29c1d6cf8c0ce724cc3ff5ed9e0b396949b44bf
Signed-off-by: Laurent Goubet <laurent.goubet@obeo.fr>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit