diff tests/test-pull-http.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 bbcd2dea19fe
children a3d73b3e1f8a
line wrap: on
line diff