tests/test-merge2.out
author Matt Mackall <mpm@selenic.com>
Sun, 29 Jan 2006 17:10:38 +1300
changeset 1653 e8a3df8b62b3
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
hgweb: show copy/rename links in file history
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