| commit | 093920a17c12be35a2c29b8163166ef258f54be2 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 6 Mar 2009 01:05:24 +0000 (5 17:05 -0800) | ||
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Sat, 7 Mar 2009 00:10:04 +0000 (7 01:10 +0100) | ||
| tree | f388c8c480fbdbee63eebc45229bf8dc76dbc798 | treesnapshot (tar.gz zip) |
| parent | aa917184ee8f6bdff3e7154dcd95d12e0d7b2a58 | commitdiff |
Fix merges involving clean subtrees with StrategySimpleTwoWayInCore
If a both sides modify files in the same subtree, but do so in a
non-conflicting way, we should still be able to merge them by an
automated merge strategy. Recursing into the subtree permits us
to do this merge.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
If a both sides modify files in the same subtree, but do so in a
non-conflicting way, we should still be able to merge them by an
automated merge strategy. Recursing into the subtree permits us
to do this merge.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
| org.spearce.jgit.test/tst/org/spearce/jgit/merge/SimpleMergeTest.java | diffblobblamehistory | |
| org.spearce.jgit/src/org/spearce/jgit/merge/StrategySimpleTwoWayInCore.java | diffblobblamehistory |