[PATCH rfc] merge: present merge part labels to user in prompts

Sean Farley sean at farley.io
Wed Mar 16 20:12:46 EDT 2016

Simon Farnsworth <simonfar at fb.com> writes:

> I've sent this as an RFC because I'm not entirely convinced I've hit everywhere that should present merge labels, and I know that _getpromptsfromlabels is in the wrong place.

I like the direction of this a lot (I get confused by rebase all the
time!). Could you show an example of this at the sprint with fancy
markers and maybe how mergetools might change?

More information about the Mercurial-devel mailing list