view tests/test-issue1438.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 2c5b2abfb8be
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying bad.patch
R link
? bad.patch