tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Thu, 21 Jun 2007 18:02:03 -0500
changeset 4674 723e0ddb6ada
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
merge: warn user about divergent renames

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b