Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-rename-dir-merge @ 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 | 7b88bd88f040 |
children | dee573ba79f1 |
comparison
equal
deleted
inserted
replaced
4385:93a4e72b4f83 | 4386:f9cd48bd8625 |
---|