]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 04df086) | patch
Implemented merge for parallel delete/modification 94/3294/2
authorBernard Leach <leachbj@bouncycastle.org>
Fri, 29 Apr 2011 09:37:00 +0000 (19:37 +1000)
committerChris Aniszczyk <caniszczyk@gmail.com>
Tue, 3 May 2011 17:11:52 +0000 (12:11 -0500)
commit98b019f4bdc45bd122e4d81009c4e814350e051c
treea6b3198d29e4a5557f1757ce21fb53517fd762fdtree | snapshot
parent04df086d3e2564b06d2a462449942fcf6e71421bcommit | diff
Implemented merge for parallel delete/modification

Duplicates cgit behaviour for merging the case where
OURS is deleted and THEIRS is modified as well as
OURS is modified and THEIRS id deleted.

Change-Id: Ia2ab4f8dc95020f2914ff01c2bf3b1bc62a9d45d
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit