diff mercurial/hg.py @ 8744:6b675c781c6d

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