view tests/test-bad-pull.out @ 3400:d2b55e3c4e25

merge: if filemerge skips merge, report as updated
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Oct 2006 16:18:09 -0500
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