tests/test-simplemerge-cmd.out
author Patrick Mezard <pmezard@gmail.com>
Tue, 17 Jul 2007 23:33:42 +0200
changeset 5083 73169e5d2732
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
posixfile_nt: '+' was understood as read mode instead of update.
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)