diff mercurial/repo.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 5b7ed414affb
children 01d98d68d697
line wrap: on
line diff