[PATCH] merge: print status message before launching external merge tool
Danek Duvall
danek.duvall at oracle.com
Thu Feb 9 18:31:50 EST 2017
Martin von Zweigbergk via Mercurial-devel wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1486661545 28800
> # Thu Feb 09 09:32:25 2017 -0800
> # Node ID 93d94750f3abee5b9798c41160a2102c61936133
> # Parent 1f51b4658f21bbb797e922d155c1046eddccf91d
> merge: print status message before launching external merge tool
>
> It seems somewhat common that people run into a merge conflict and
> don't notice the launched merge tool, and instead they thing hg just
> hung. Let's print a message for each file that we launch the merge
> tool for.
Perhaps only if it's a gui invocation? If it's in the terminal, it'll just
disappear in the noise. If a window pops up (non-interactively), that's
when you might need the warning.
Danek
More information about the Mercurial-devel
mailing list