tests/test-simplemerge-cmd.out
author Eric Hopper <hopper@omnifarious.org>
Thu, 21 Jun 2007 10:40:09 -0700
changeset 4675 6858a7477a5e
parent 4364 d5c3a70f8422
child 5081 ea7b982b6c08
permissions -rw-r--r--
Change branches to sort 'active' branches first, and add an option to show only active branches.
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)