tests/test-simplemerge-cmd.out
author Brendan Cully <brendan@kublai.com>
Tue, 03 Jul 2007 19:49:36 -0700
changeset 4798 83c1bbb934ec
parent 4364 d5c3a70f8422
child 5081 ea7b982b6c08
permissions -rw-r--r--
convert: svn merges produce hard-to-trace file entries. Ignore them for now.
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)