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

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