comparison Makefile @ 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 c51fad25e59e
children 2ab464771b7d 1a7794525c2b
comparison
equal deleted inserted replaced
2547:d75c68b55af8 2548:0229ff95faec