tests/test-merge3.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Sun, 21 May 2006 23:07:19 -0700
changeset 2331 953dbfb2824c
parent 1747 91c56c427171
permissions -rw-r--r--
diff: allow to use -rA:B syntax as well as -rA -rB
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