tests/test-merge3.out
author Matt Mackall <mpm@selenic.com>
Tue, 01 Dec 2009 14:37:57 -0600
changeset 9983 46c6bac41dc6
parent 1747 91c56c427171
permissions -rw-r--r--
Merge with crew
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