Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simplemerge-cmd.out @ 4921:52772826e969
Automated merge with http://hg.intevation.org/mercurial/crew
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 18 Jul 2007 19:47:22 -0700 |
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) |