Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simplemerge-cmd.out @ 5028:36e8983fe44d
test-convert: Hide warning about missing subversion bindings.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 29 Jul 2007 19:32:55 +0200 |
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) |