Re: [PATCH] mergetool merge/skip/abort

Caleb Cushing [off-list ref] writes:

so does my patch satisfy now? what's it take to get it included in the
next version of git?

I do not use mergetool myself so I generally do not pay attention to
patches on this tool, but I would want to pick up ones that people
involved in mergetool discussion can agree to be good patches.

There are a few mergetool updates in flight from various authors.  How
does your submission compare with others' in both form/presentation and
clarity of logic (remember, I am not keeping track)?