changeset 19019 | 53060cc1b601 |
parent 18934 | 93f3a06b2035 |
child 20117 | aa9385f983fa |
--- a/tests/test-histedit-fold-non-commute.t Tue Apr 16 20:48:37 2013 +0200 +++ b/tests/test-histedit-fold-non-commute.t Tue Apr 16 21:57:25 2013 -0500 @@ -86,7 +86,7 @@ edit the history - $ HGEDITOR="cat \"$EDITED\" > " hg histedit 3 2>&1 | fixbundle + $ hg histedit 3 --commands $EDITED 2>&1 | fixbundle 2 files updated, 0 files merged, 0 files removed, 0 files unresolved merging e warning: conflicts during merge.