tests/test-merge3.out
author Sune Foldager <cryo@cyanite.org>
Wed, 10 Mar 2010 12:38:33 +0100
changeset 10628 6227c8d669d5
parent 1747 91c56c427171
permissions -rw-r--r--
rebase: improve output of hg pull --rebase (issue2072)
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