view tests/test-issue1089.out @ 8736:7619b16ea880

merge: fix prompt keep
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 2268edff1bec
children
line wrap: on
line source

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