diff tests/test-merge-revert @ 8744:6b675c781c6d

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