]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 009507c) | patch
Add a test for merging deleted files 45/1845/1
authorChristian Halstrick <christian.halstrick@sap.com>
Wed, 3 Nov 2010 12:32:54 +0000 (13:32 +0100)
committerChristian Halstrick <christian.halstrick@sap.com>
Wed, 3 Nov 2010 12:37:45 +0000 (13:37 +0100)
commitf5076d8b041bc7d0e1497cacbec370237a5ccaf7
treee44d44306d16ecc39cc0c7017d335f26e07dcff1tree | snapshot
parent009507ca2eafe1c6218ca3779348452495dcd3a3commit | diff
Add a test for merging deleted files

The JGit merge algorithm or the Merge Command may have problems with handling
deletions always correctly. Therefore one additional test is added to check
this.

Change-Id: Id6aa49136996b29047c340994fe7faba68858e8c
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit