Mercurial > hg
diff tests/test-histedit-arguments.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 | b6673e9bdcf6 |
| children | db5560c07a28 |
line wrap: on
line diff
--- a/tests/test-histedit-arguments.t Fri Mar 29 21:53:15 2019 -0400 +++ b/tests/test-histedit-arguments.t Mon Apr 01 19:02:24 2019 -0700 @@ -139,7 +139,6 @@ > edit 08d98a8350f3 4 five > EOF 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - reverting alpha Editing (08d98a8350f3), you may commit or record as needed now. (hg histedit --continue to resume) [1] @@ -476,7 +475,6 @@ > pick 8cde254db839 > edit 6f2f0241f119 > EOF - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging foo warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') Fix up the change (pick 8cde254db839)