Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge1 @ 3257:c93ce7f10f85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fixes for merge+rename findcopies: ignore files renamed on both branches applyupdates: change remove flag to move recordupdates: record copy actions, including local moves and deletions
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 19:08:04 -0500
parents e506c14382fd
children 49966b5ab16f
line wrap: on
line diff