tests/test-merge3.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sun, 29 Oct 2006 10:53:51 +0100
changeset 3578 3b4e00cba57a
parent 1747 91c56c427171
permissions -rw-r--r--
Define and use nullrev (revision of nullid) instead of -1.
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