diff tests/test-mv-cp-st-diff.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 2d9328a2f81f
children 3f4f14eab085
line wrap: on
line diff