Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-simplemerge-cmd.out @ 4588:9855939d0c82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert extension: Save a few opens on the map file Save a few opens on the map file adding a class attribute
author Edouard Gomez <ed.gomez@free.fr>
date Thu, 14 Jun 2007 23:25:55 +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)