view tests/test-issue1089.out @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents 2268edff1bec
children
line wrap: on
line source

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