tests/test-simplemerge-cmd.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 03 Jul 2007 03:06:40 -0300
changeset 4775 438603c1eb6f
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
test-rename: use hg status -C; don't use hg debugstate | grep copy
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)