tests/test-merge3.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 13 Mar 2006 13:19:23 +0100
changeset 1936 8393baa0858c
parent 1747 91c56c427171
permissions -rw-r--r--
Make test-remove portable for strange strftime implementations (second try). I forgot to replace the date output for 'hg log -p', too.
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