tests/test-merge2.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 16 Jan 2006 15:51:09 +0100
changeset 1622 5e9168401a68
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
fix locate broken since 63799b01985c - fix the keyword arguments for walk in commands.locate - implement 'hg locate -r <rev>' - add a test for 'hg locate'
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