--- a/tests/test-keyword	Fri Jan 11 23:36:56 2008 +0100
+++ b/tests/test-keyword	Mon Jan 14 15:12:20 2008 +0100
@@ -44,7 +44,7 @@
 
 echo % default keyword expansion including commit hook
 echo % interrupted commit should not change state or run commit hook
-HGEDITOR=false hg --debug commit
+hg --debug commit
 echo % status
 hg status
 
@@ -144,7 +144,7 @@
 EOF
 
 echo % interrupted commit should not change state
-HGEDITOR=false hg commit
+hg commit
 echo % status
 hg status
 
@@ -220,7 +220,7 @@
 hg --verbose kwshrink a
 echo % cat a
 cat a
-cd - > /dev/null 2>&1
+cd ..
 
 echo % kwexpand nonexistent
 hg kwexpand nonexistent

--- a/tests/test-keyword.out	Fri Jan 11 23:36:56 2008 +0100
+++ b/tests/test-keyword.out	Mon Jan 14 15:12:20 2008 +0100
@@ -103,7 +103,7 @@
 sym
 transaction abort!
 rollback completed
-abort: edit failed: false exited with status 1
+abort: empty commit message
 % status
 A a
 A b
@@ -221,7 +221,7 @@
 % interrupted commit should not change state
 transaction abort!
 rollback completed
-abort: edit failed: false exited with status 1
+abort: empty commit message
 % status
 M a
 ? log