tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Tue, 10 Oct 2006 02:11:59 -0500
changeset 3313 6c68bc1e7873
parent 1747 91c56c427171
permissions -rw-r--r--
context: change workingctx str() from . to <node>+
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
removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
     2
nothing changed