diff hgmerge @ 2038:5c4496ed152d

Tell the user the real "hg update -C" command, not just "-C" when aborting.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 02 Apr 2006 18:16:06 +0200
parents c4d577262d00
children 6a03cff2b0f5
line wrap: on
line diff