tests/test-merge3.out
author Martin Geisler <mg@lazybytes.net>
Mon, 01 Mar 2010 22:47:39 +0100
branchstable
changeset 10563 bb4561401c84
parent 1747 91c56c427171
permissions -rw-r--r--
Merge with hg-i18n
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