diff tests/test-double-merge.out @ 8744:6b675c781c6d

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