tests/test-merge3.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 08 May 2007 11:51:25 -0700
changeset 4419 59ddd43f609f
parent 1747 91c56c427171
permissions -rw-r--r--
contrib/hgsh: Check for .hg/store as well as .hg/data. This is required by the new repository layout.
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