view tests/test-notfound.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 9462df772bc8
children 883d887c6408
line wrap: on
line source

Is there an error message when trying to diff non-existing files?
found: No such file or directory
not: No such file or directory
Is there an error message when trying to add non-existing files?
found: No such file or directory
not: No such file or directory