tests/test-merge4.out
author Matt Mackall <mpm@selenic.com>
Mon, 25 Sep 2006 16:45:31 -0500
changeset 3153 c82ea81d6850
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
Add core copy detection algorithm This adds findcopies, which detects merge-relevant copies between files in a pair of manifests back to the merge ancestor. While the merge code invokes the copy detection routine, it does not yet use the result.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)