[PATCH V2] merge: print status message before launching external merge tool

Sean Farley sean at farley.io
Fri Feb 10 18:00:50 EST 2017


Martin von Zweigbergk via Mercurial-devel
<mercurial-devel at mercurial-scm.org> writes:

> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1486661545 28800
> #      Thu Feb 09 09:32:25 2017 -0800
> # Node ID a5615bea1858aca891fcd3d7da6a477fc183f478
> # 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 think hg just
> hung. Let's print a message for each file that we launch a GUI merge
> tool for.

Sure, looks good to me.


More information about the Mercurial-devel mailing list