tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Tue, 24 Jan 2006 13:49:20 +1300
changeset 1631 4fb25c078d06
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Merge with crew
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     1
adding b
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     2
adding b