view tests/test-bad-pull.out @ 2548:0229ff95faec

Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents 5eb02f9ed804
children
line wrap: on
line source

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