Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-simplemerge-cmd.out @ 5031:af0995261f02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extensions: don't get confused by aliasing between "foo" and "hgext.foo"
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 30 Jul 2007 14:53:03 -0700
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)