Mercurial > hg
diff tests/test-histedit-fold.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 | 704a3aa3dc0a |
| children | 21733e8c924f |
line wrap: on
line diff
--- a/tests/test-histedit-fold.t Fri Mar 29 21:53:15 2019 -0400 +++ b/tests/test-histedit-fold.t Mon Apr 01 19:02:24 2019 -0700 @@ -287,7 +287,6 @@ > drop 888f9082bf99 2 +5 > fold 251d831eeec5 3 +6 > EOF - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') Fix up the change (fold 251d831eeec5) @@ -361,7 +360,6 @@ > drop 888f9082bf99 2 +5 > fold 251d831eeec5 3 +6 > EOF - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') Fix up the change (fold 251d831eeec5) @@ -541,6 +539,7 @@ > fold b7389cc4d66e 3 foo2 > fold 21679ff7675c 4 foo3 > EOF + merging foo $ hg logt 2:e8bedbda72c1 merged foos 1:578c7455730c a