diff tests/test-merge1 @ 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 7544700fd931
children e506c14382fd
line wrap: on
line diff