tests/test-simplemerge-cmd.out
author Daniel Holth <dholth@fastmail.fm>
Sun, 01 Jul 2007 23:56:11 +0200
changeset 4765 b6a1f2c46c6c
parent 4364 d5c3a70f8422
child 5081 ea7b982b6c08
permissions -rw-r--r--
convert extension: Add SVN converter
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)