view tests/test-issue1089.out @ 8503:90f86a5330bb

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

adding a/b
removing a/b
adding a/b
removing a/b