tests/test-simplemerge-cmd.out
author Joel Rosdahl <joel@rosdahl.net>
Mon, 04 Jun 2007 21:48:59 +0200
changeset 4504 c68e6486f295
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
Add test reproducing a bug in "hg serve -v"
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)