Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 2171:290534ee163c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add download links to hgwebdir index page for allowed archive types. Based on a patch by Colin McMillen <mcmillen@cs.cmu.edu>
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 01 May 2006 10:02:17 +0200
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