--- a/tests/test-histedit-fold-non-commute.t Wed Mar 02 15:01:41 2016 -0800
+++ b/tests/test-histedit-fold-non-commute.t Wed Mar 02 22:09:18 2016 +0000
@@ -97,13 +97,7 @@
$ hg resolve --mark e
(no more unresolved files)
continue: hg histedit --continue
- $ cat > cat.py <<EOF
- > import sys
- > print open(sys.argv[1]).read()
- > print
- > print
- > EOF
- $ HGEDITOR="python cat.py" hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed'
+ $ HGEDITOR=cat hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed'
d
***
does not commute with e
@@ -117,9 +111,6 @@
HG: branch 'default'
HG: changed d
HG: changed e
-
-
-
merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change (pick 7b4e2f4b7bcd)