Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 1239:29f17e083e84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Turn hgit into an extension, and add commands supporting the latest gitk
author mason@suse.com
date Tue, 13 Sep 2005 19:33:10 -0500
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