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

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