tests/test-simplemerge-cmd.out
author paul sorenson <sf@metrak.com>
Sat, 23 Jun 2007 22:25:11 -0500
changeset 4692 c135c6cddbec
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
Command in doc comment is now on a single line, fixed after previous formatting broke it.
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)