Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 1678:b345cc4c22c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reverting 11d12bd6e1dcd9610fa26e97d25e7ad553e8ffa5 passing local everywhere violate the layering
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 15 Dec 2005 18:04:05 +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