tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Mon, 21 Aug 2006 14:25:56 -0500
changeset 2969 833677bc9791
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
merge: rename mysterious variable

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