Re: [PATCH] fixup! mergetools: simplify how we handle "vim" and "defaults"

David Aguilar [off-list ref] writes:

On Mon, Jan 28, 2013 at 11:28 AM, John Keeping [off-list ref] wrote:

quoted

---
Junio, please can you squash this into f9924e5 on jk/mergetool,
providing that David is OK with that?

This looks good to me.

Thanks for a quick response.  Will squash this in and rebuild the
two affected branches.