Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge2.out @ 1303:2dc06dd76ff4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix path of win32text extension in INI file.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 21 Sep 2005 15:27:00 -0700
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