Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-simplemerge-cmd.out @ 4519:5a9e767c2908

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include convert extension in packages setup (reported by Christian Ebert and Eric Hopper)
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 07 Jun 2007 22:28:52 +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)