tests/test-simplemerge-cmd.out
author Matt Mackall <mpm@selenic.com>
Mon, 25 Jun 2007 21:18:19 -0500
changeset 4724 a084ed4b0c35
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
Added tag 0.9.4 for changeset fb4b6d5fe100
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)