diff mercurial/error.py @ 8744:6b675c781c6d

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