tests/test-simplemerge-cmd.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 01 Aug 2007 10:42:42 +0200
changeset 5040 4f34d9b2568e
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
Update style of record's cmdtable to match mercurial/commands.py
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)