diff options
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java index adb2278d89..d8a9423e8e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java @@ -131,7 +131,7 @@ public class StrategySimpleTwoWayInCore extends ThreeWayMergeStrategy { add(T_THEIRS, DirCacheEntry.STAGE_0); else if (modeB == modeT && tw.idEqual(T_BASE, T_THEIRS)) add(T_OURS, DirCacheEntry.STAGE_0); - else if (tw.isSubtree()) { + else { if (nonTree(modeB)) { add(T_BASE, DirCacheEntry.STAGE_1); hasConflict = true; @@ -144,12 +144,8 @@ public class StrategySimpleTwoWayInCore extends ThreeWayMergeStrategy { add(T_THEIRS, DirCacheEntry.STAGE_3); hasConflict = true; } - tw.enterSubtree(); - } else { - add(T_BASE, DirCacheEntry.STAGE_1); - add(T_OURS, DirCacheEntry.STAGE_2); - add(T_THEIRS, DirCacheEntry.STAGE_3); - hasConflict = true; + if (tw.isSubtree()) + tw.enterSubtree(); } } builder.finish(); |