Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge5.out @ 4386:f9cd48bd8625

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fffc8a733bf9
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes