Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge3 @ 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 | 7544700fd931 |
children |