Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-simplemerge-cmd.out @ 4599:88fc92b0b821

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patchbomb: page patchbomb messages only if PAGER is defined. Paging is complicated under win32. It is just better to avoid it by default.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 17 Jun 2007 20:35:43 +0200
parents d5c3a70f8422
children ea7b982b6c08
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4360
d5c3a70f8422 polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
1 (binary:application/octet-stream)