tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 31 Oct 2006 13:02:49 +0100
changeset 3592 fffc8a733bf9
parent 3580 41989e55fa37
child 6336 4b0c9c674707
permissions -rw-r--r--
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2038
diff changeset
     1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
     2
removing b
3592
fffc8a733bf9 Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3580
diff changeset
     3
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes