tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Mon, 02 Oct 2006 12:04:48 -0500
changeset 3233 3fd098e0902d
parent 2175 b2ae81a7df29
permissions -rw-r--r--
merge: extend file merge function for 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