tests/test-simplemerge-cmd.out
author Brendan Cully <brendan@kublai.com>
Mon, 30 Apr 2007 09:32:44 -0700
changeset 4394 a6436e9333db
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
Also restore old rm -A behavior for inexact patterns
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)