tests/test-simplemerge-cmd.out
author Matt Mackall <mpm@selenic.com>
Mon, 18 Jun 2007 19:43:26 -0500
changeset 4631 e3afa670e484
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
demandimport: fix issue579 and add a test fix suggested by Brendan
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)