Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 1780:8a1f2eae2832

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jeffpc
author Matt Mackall <mpm@selenic.com>
date Tue, 21 Feb 2006 17:36:27 -0600
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