Mercurial > hg
diff tests/test-histedit-edit.t @ 42052:15d2afa31e57
histedit: narrow the scope of discarded ui output
In 34165875fa5df813bec3a0cd348932b304d44efb, a lot of the output from
histedit was excluded. This slightly adjusts the scope of that exclusion,
to both discard more uninsteresting messages, and ensure that pre-merge-tool
output gets shown before the external merge tool is executed.
Differential Revision: https://phab.mercurial-scm.org/D6177
author | Rodrigo Damazio Bovendorp <rdamazio@google.com> |
---|---|
date | Mon, 01 Apr 2019 19:02:24 -0700 |
parents | 57c462db87fd |
children | c6d31e659a28 |
line wrap: on
line diff
--- a/tests/test-histedit-edit.t Fri Mar 29 21:53:15 2019 -0400 +++ b/tests/test-histedit-edit.t Mon Apr 01 19:02:24 2019 -0700 @@ -433,7 +433,6 @@ > edit cb9a9f314b8b a > $EDITED > EOF 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - adding a Editing (cb9a9f314b8b), you may commit or record as needed now. (hg histedit --continue to resume) [1]