]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 59baf91) | patch
A deleted work tree file is not a conflict when merge wants to delete it 32/11732/2
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Mon, 8 Apr 2013 20:05:06 +0000 (22:05 +0200)
committerRobin Rosenberg <robin.rosenberg@dewire.com>
Mon, 8 Apr 2013 20:43:39 +0000 (22:43 +0200)
commitcc00feaa8d0368f4a5caefa002025e2168f71a12
tree28e7cdfa16689c63a221bfbb3514fb63bb606ad6tree | snapshot
parent59baf9148e4b16028203d9e881136ab4c005202ccommit | diff
A deleted work tree file is not a conflict when merge wants to delete it

Bug: 405199
Change-Id: I4b2ef3dc432d2fad8a6fabd1c8aec407b5c8c5ac
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.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