tests/test-merge2.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 27 Dec 2005 12:52:10 -0600
changeset 1596 41366b7d6709
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
fix 'hg tag <tagname> <revision> - fix a collision with the option keyword rev and the option name - update the tests
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