Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 2209:956e329f9e13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
document hgignore syntax in new file doc/hgignore.5.txt. fix issue 162.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 04 May 2006 22:20:02 -0700
parents 91c56c427171
children
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 removing b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 775
diff changeset
2 nothing changed