# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1244331063 -7200
# Node ID f6af6e74261248b32d8d824213d7993f7a923879
# Parent  05cf88057fc5c769249a790e28ef2bbfc2d54ade# Parent  e86eaa71219d0dd211718005b3587bd0883dbfe3
Merge with stable

diff -r 05cf88057fc5 -r f6af6e742612 tests/test-keyword
--- a/tests/test-keyword	Thu Jun 04 09:16:22 2009 +0200
+++ b/tests/test-keyword	Sun Jun 07 01:31:03 2009 +0200
@@ -322,7 +322,7 @@
 echo % keyword stays outside conflict zone
 cat m
 echo % resolve to local
-HGMERGE=internal:local hg resolve
+HGMERGE=internal:local hg resolve -a
 hg commit -m localresolve
 cat m