tests/test-simplemerge-cmd.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 19 Jun 2007 08:51:34 +0200
changeset 4635 63b9d2deed48
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
Updated copyright notices and add "and others" to "hg version"
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)