diff tests/test-revlog-ancestry.py.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 c7cc40fd74f6
children eb88ed4269c5
line wrap: on
line diff