diff tests/test-convert-hg-sink.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 e7ed5d07cc4c
children 68e0a55eee6e
line wrap: on
line diff