]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e03f189) | patch
Failing to delete a directory with untracked content is actually ok 93/21493/3
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Tue, 4 Feb 2014 00:00:41 +0000 (01:00 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 10 Feb 2014 10:25:02 +0000 (11:25 +0100)
commitff83f54d29a2e3c2fda5e25b60bd7d20347c53ca
treee314fc228a60d3aaa8941e10128cb8393ef8a647tree | snapshot
parente03f18941f5d996d23bc004ad63049bcfc0e53d3commit | diff
Failing to delete a directory with untracked content is actually ok

We had a test, but it was wrong.

Bug: 424630
Change-Id: I926e0954c8623a323a50fe8be3ebe5e0ac6944c8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.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