comparison tests/test-flags @ 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 e506c14382fd
children 455109df3669
comparison
equal deleted inserted replaced
2547:d75c68b55af8 2548:0229ff95faec