tests/test-merge3.out
author Steve Borho <steve@ageia.com>
Tue, 02 Oct 2007 20:22:33 +0200
changeset 5350 1df76921aab3
parent 1747 91c56c427171
permissions -rw-r--r--
set_exec: do not chmod a symlink
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