diff -r f3200bf460a8 -r d0d3e5c6eb3c tests/test-rebase-cache.t
--- a/tests/test-rebase-cache.t	Sat Aug 16 10:43:59 2014 +0900
+++ b/tests/test-rebase-cache.t	Sat Aug 16 10:43:59 2014 +0900
@@ -470,5 +470,11 @@
   o  0 A public
   
 
-  $ hg rebase --dest 7 --source 5
+  $ cat > $TESTTMP/checkeditform.sh <<EOF
+  > env | grep HGEDITFORM
+  > true
+  > EOF
+  $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e
+  HGEDITFORM=rebase.merge
+  HGEDITFORM=rebase.normal
   saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/*-backup.hg (glob)