Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simplemerge-cmd.out @ 4386:f9cd48bd8625
Fix minor mismerge.
The caching of umask ended up being duplicated.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 28 Apr 2007 17:55:45 -0300 |
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) |