diff tests/test-command-template.out @ 8744:6b675c781c6d

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