comparison mercurial/cmdutil.py @ 3251:c93ce7f10f85

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 eeaf9bcdfa25
children a33a9af1ec03
comparison
equal deleted inserted replaced
3250:7c114915fbdb 3251:c93ce7f10f85