tests/test-simplemerge-cmd.out
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
Tue, 29 May 2007 05:08:01 -0400
changeset 4458 e19d9b1223ee
parent 4364 d5c3a70f8422
child 5081 ea7b982b6c08
permissions -rw-r--r--
hgweb: manifest: pass parity for the '[up]' link
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4364
d5c3a70f8422 polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
     1
(binary:application/octet-stream)