Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge-commit.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 | e7282dede8cd |
| children | 17ed9b9a0d03 |
comparison
equal
deleted
inserted
replaced
| 4385:93a4e72b4f83 | 4386:f9cd48bd8625 |
|---|