--- a/tests/test-histedit-edit.t Mon Dec 28 22:52:48 2015 +0000
+++ b/tests/test-histedit-edit.t Mon Dec 28 22:53:22 2015 +0000
@@ -451,9 +451,6 @@
> mv tmp "\$1"
> EOF
$ HGEDITOR="sh ../edit.sh" hg histedit 2
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- reverting a
- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
warning: histedit rules saved to: .hg/histedit-last-edit.txt
abort: cannot fold into public change 18aa70c8ad22
[255]
@@ -472,6 +469,3 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
-TODO: this abort shouldn't be required, but it is for now to leave the repo in
-a clean state.
- $ hg histedit --abort