tests/test-merge3.out
author Alexander Solovyov <piranha@piranha.org.ua>
Sat, 27 Mar 2010 13:39:45 +0200
branchstable
changeset 10793 16df09a54113
parent 1747 91c56c427171
permissions -rw-r--r--
expand paths in aliases
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