Mercurial > hg > mercurial-crew-with-dirclash

comparison hgmerge @ 768:20e95c245bc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH
author mpm@selenic.com
date Sat, 23 Jul 2005 10:00:56 -0500
parents 4fc63e22b1fe
children cd0ad12d9e42 8f5637f0a0c0 0902ffece4b4
comparison
equal deleted inserted replaced
767:61ed30e82b27 768:20e95c245bc3