tests/test-merge3.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 27 Jul 2007 14:30:20 -0700
changeset 5024 7963438881f5
parent 1747 91c56c427171
permissions -rw-r--r--
convert: empty log messages are OK as of 7f5c3fb0a37d
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