diff tests/test-mq-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 9a398dd53bcc
children 561ff8d9e4f0
line wrap: on
line diff