tests/test-merge3.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 22 Jan 2009 14:32:39 +0100
changeset 7679 eb98218db768
parent 1747 91c56c427171
permissions -rw-r--r--
tests: fix up tests to cope with 6a0bc2dc9da6
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