tests/test-merge2.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 06 Sep 2007 10:52:54 -0700
changeset 5285 3ef190234b55
parent 2175 b2ae81a7df29
permissions -rw-r--r--
record: change wording of initial per-file prompt

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