tests/test-merge2.out
author jdc@uwo.ca
Wed, 31 Aug 2005 11:56:58 -0700
changeset 1178 a7abffa4b19f
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
Adjust hg-strip and hg-chomp regexps.
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