Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simplemerge-cmd.out @ 4802:7549cd526b7f
Fix serve on Windows without win32* modules.
author | Nathan Jones <nathanj@insightbb.com> |
---|---|
date | Tue, 26 Jun 2007 10:48:58 -0400 |
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) |