Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simplemerge-cmd.out @ 4542:af02e6078d08
dispatch: reorder functions
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 11 Jun 2007 21:09:23 -0500 |
parents | d5c3a70f8422 |
children | ea7b982b6c08 |
rev | line source |
---|---|
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) |