diff mercurial/context.py @ 8744:6b675c781c6d

merge: simplify 'other deleted' case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents e8de59577257
children 859f841937d0
line wrap: on
line diff