changeset 27405 | 5837ca674da9 |
parent 27134 | cb5bdf65420f |
child 27629 | e7ff83b2bcfe |
--- a/tests/test-histedit-non-commute-abort.t Mon Dec 14 23:14:06 2015 +0000 +++ b/tests/test-histedit-non-commute-abort.t Mon Dec 14 21:43:16 2015 +0000 @@ -70,7 +70,6 @@ > pick 652413bf663e f > EOF 0 files updated, 0 files merged, 2 files removed, 0 files unresolved - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') Fix up the change and run hg histedit --continue