Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 2610:7a87aebd848e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix sed expression for OS X and Solaris 2.6. Matches previous fixes in other tests.
author Lee Cantey <lcantey@gmail.com>
date Thu, 13 Jul 2006 11:19:35 -0700
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