diff options
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 2ea1160793..710996d2a8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -488,7 +488,11 @@ public class ResolveMerger extends ThreeWayMerger { return true; } else if (modeT == 0 && modeB != 0) { // we want THEIRS ... but THEIRS contains the deletion of the - // file + // file. Also, do not complain if the file is already deleted + // locally. This complements the test in isWorktreeDirty() for + // the same case. + if (tw.getTreeCount() > T_FILE && tw.getRawMode(T_FILE) == 0) + return true; toBeDeleted.add(tw.getPathString()); return true; } |