Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 1891:e5c8e38b788f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New version/release in mercurial.spec, patchbomb is now in hgext.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 12 Mar 2006 15:11:11 +0100
parents 5a034646e472
children b2ae81a7df29
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 adding b
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 749
diff changeset
2 adding b