diff tests/test-bookmarks @ 8503:90f86a5330bb

commit: tidy up mergestate slightly
author Matt Mackall <mpm@selenic.com>
date Mon, 18 May 2009 17:36:24 -0500
parents 4ba89b6d0e05
children 717c35d55fb3
line wrap: on
line diff