changeset 19020 | 12c06686d371 |
parent 19019 | 53060cc1b601 |
child 20117 | aa9385f983fa |
--- a/tests/test-histedit-non-commute.t Tue Apr 16 21:57:25 2013 -0500 +++ b/tests/test-histedit-non-commute.t Tue Apr 16 21:17:13 2013 +0200 @@ -240,7 +240,7 @@ $ echo 'I can haz no commute' > e $ hg resolve --mark e - $ hg histedit --commands $EDITED --continue 2>&1 | fixbundle + $ hg histedit --continue 2>&1 | fixbundle 0 files updated, 0 files merged, 0 files removed, 0 files unresolved merging e warning: conflicts during merge.