Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simplemerge-cmd.out @ 4391:722417b3d7fa
Add hgwebdir.fcgi to contrib
author | Michael Gebetsroither <michael.geb@gmx.at> |
---|---|
date | Sun, 29 Apr 2007 18:17:35 -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) |