# HG changeset patch
# User Brodie Rao <brodie@bitheap.org>
# Date 1284332753 18000
# Node ID b87861f5722250891d94ef40f37c83c25d6e82d2
# Parent  d91c2fa1c24859cdf5d0f04f3fb351326ade0fb6
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'

Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.

[ original upstream message ]

diff -r d91c2fa1c248 -r b87861f57222 tests/test-keyword.t
--- a/tests/test-keyword.t	Fri Sep 10 21:22:11 2010 +0200
+++ b/tests/test-keyword.t	Sun Sep 12 18:05:53 2010 -0500
@@ -817,7 +817,7 @@
   warning: conflicts during merge.
   merging m failed!
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   $ cat m
   $Id$
   <<<<<<< local