tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Mon, 09 Oct 2006 21:27:04 -0500
changeset 3305 e7abcf3a7c5f
parent 2175 b2ae81a7df29
permissions -rw-r--r--
filemerge: use contexts rather than my and other

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