view tests/test-bad-pull.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 5eb02f9ed804
children 490e40816cbd
line wrap: on
line source

abort: error: Connection refused
255
copy: No such file or directory
abort: HTTP Error 404
0