motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Simplify logic in StrategySimpleTwoWayInCore"

This commit is contained in:
Chris Aniszczyk 2010-12-09 18:30:41 -05:00 committed by Code Review
parent 2a7cd0086b 33c670c1f0
commit ec5116b09c
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.eclipse.jgit/src/org/eclipse/jgit/merge/StrategySimpleTwoWayInCore.java
View File

@ -131,7 +131,7 @@ protected boolean mergeImpl() throws IOException {
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 @@ else if (tw.isSubtree()) {
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();