diff mercurial/filemerge.py @ 8738:8a9899a6327e

merge: simplify a delete case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 94ca38e63576
children a9850eda2973
line wrap: on
line diff