diff tests/test-rename-merge2.out @ 8744:6b675c781c6d

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