tests/test-simplemerge-cmd.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 13 Jun 2007 21:39:45 -0300
changeset 4577 e7d4ed543de5
parent 4360 d5c3a70f8422
child 5115 ea7b982b6c08
permissions -rw-r--r--
localrepo.status: only append stuff to the clean list if list_clean is true This is consistent with dirstate.status.
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)