Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 4363:c6413f8f2f8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use python instead of shell printf with \x for test-simplemerge-cmd Needed e.g. to be compatible with Solaris.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 19 Apr 2007 12:47:55 +0200
parents 91c56c427171
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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