comparison mercurial/filemerge.py @ 8744:6b675c781c6d

merge: simplify 'other deleted' case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 94ca38e63576
children a9850eda2973
comparison
equal deleted inserted replaced
8743:a8d5af707656 8744:6b675c781c6d