Re: Move to git is imminent - awaiting Stefan's approval

[Eli Zaretskii]

> From: Stefan Monnier <address@hidden>
> Date: Tue, 07 Jan 2014 08:45:47 -0500
> Cc: address@hidden
> 
> while I'd be happy to take patches to better support git-mergetool
> (if needed), I prefer using the vc-find-conflicted-files workflow.

Same here.  It's so dead easy that it's hard to beat: just visit the
offending file (which is automatically put in SMerge mode), edit to
resolve the conflict and remove the conflict markers, then save -- and
the VC back-end will automatically do whatever it takes to finish
conflict resolution.