comparison mercurial/hg.py @ 4399:3b7e284b8f28

merge: expand and simplify the invalid handling for directory moves
author Matt Mackall <mpm@selenic.com>
date Thu, 03 May 2007 17:24:43 -0500
parents 0f9381cf9723
children e6d26e71f049
comparison
equal deleted inserted replaced
4398:9fe267f77f56 4399:3b7e284b8f28