tests/test-merge3.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 06 Oct 2006 16:24:14 +0200
changeset 3275 7ae37d99d47e
parent 1747 91c56c427171
permissions -rw-r--r--
ssh: make the error message more clear, add a testcase
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