Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-simplemerge-cmd.out @ 4940:71fed370b7a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backout ad09ce1d393c and replace ''' with """ to make some highlighting happy. I have tried Debian's default emacs and the current CVS version. Default emacs doesn't have highlighting enabled (and being emacs-illiterate I don't know how to enable it) and the CVS emacs' Python highlighting has no problems with ' characters here.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 21 Jul 2007 10:36:51 +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)