Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-simplemerge-cmd.out @ 4360:d5c3a70f8422
polish the simplemerge command; add a test
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 16 Apr 2007 20:17:39 -0300 |
parents | |
children | ea7b982b6c08 |
comparison
equal
deleted
inserted
replaced
4359:2e3c54fb79a3 | 4360:d5c3a70f8422 |
---|---|
1 (binary file application/octet-stream, hash: af65897f8f33eae228258c6d0058296a79f3d442) |