| commit | f3308b8e94e1d78cec4c5037ae15d6ac145ff566 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sat, 28 Mar 2009 02:53:51 +0000 (27 19:53 -0700) | ||
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | |
| Sat, 28 Mar 2009 12:24:48 +0000 (28 13:24 +0100) | ||
| tree | 295bc36f42b97a51f883fa345ba94b20f55a5a9b | treesnapshot (tar.gz zip) |
| parent | 7723b585c0bebdff7696a288004304f8f7a3c0c0 | commitdiff |
Introduce ThreeWayMerge API
A 3-way merge (2 trees, and one common ancestor) is a specialized
type of merge which has a tighter restriction on its inputs. This
change refactors the merge API slightly to introduce this special
type, so we can add 3-way specific operations on the API.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
A 3-way merge (2 trees, and one common ancestor) is a specialized
type of merge which has a tighter restriction on its inputs. This
change refactors the merge API slightly to introduce this special
type, so we can add 3-way specific operations on the API.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>