tests/test-merge2.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 20 Feb 2006 19:04:56 +0100
changeset 1755 a8f7791e3680
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
add 'debugrebuildstate' to rebuild the dirstate from a given revision - added and removed files will be lost while recreating the dirstate - modifications are not lost
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