comparison tests/test-merge6.out @ 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 ced2d3620f95
children b2ae81a7df29
comparison
equal deleted inserted replaced
2037:f90513a3dbcd 2038:5c4496ed152d