tests/test-simplemerge-cmd.out
author Brendan Cully <brendan@kublai.com>
Fri, 06 Jul 2007 10:22:22 -0700
changeset 4847 845e0071b704
parent 4364 d5c3a70f8422
child 5081 ea7b982b6c08
permissions -rw-r--r--
Sort changelog extra dict to avoid possible nondeterminism
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)