# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1321614419 0
# Node ID c1ee4cc36089dc7cbaee6030b00a90e3e6efb1fc
# Parent  c7a801067441b69fe89e248468d359be8699ef60# Parent  0b56a38520afd50d1a60718df27fd9a0ba0246f5
Merge with stable

diff -r c7a801067441 -r c1ee4cc36089 tests/test-keyword.t
--- a/tests/test-keyword.t	Wed Nov 16 12:55:59 2011 +0000
+++ b/tests/test-keyword.t	Fri Nov 18 11:06:59 2011 +0000
@@ -976,7 +976,7 @@
   $ hg merge
   merging m
   warning: conflicts during merge.
-  merging m failed!
+  merging m incomplete! (edit conflicts, then use 'hg resolve --mark')
   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
   [1]