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

2013-01-28 Thread Junio C Hamano
David Aguilar writes: > On Mon, Jan 28, 2013 at 11:28 AM, John Keeping wrote: >> --- >> 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 affec

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

2013-01-28 Thread David Aguilar
On Mon, Jan 28, 2013 at 11:28 AM, John Keeping wrote: > --- > Junio, please can you squash this into f9924e5 on jk/mergetool, > providing that David is OK with that? This looks good to me. > The original change breaks custom mergetool by making changing the logic > around default functions so th

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

2013-01-28 Thread John Keeping
--- Junio, please can you squash this into f9924e5 on jk/mergetool, providing that David is OK with that? The original change breaks custom mergetool by making changing the logic around default functions so that they are now only defined when the tool file exists in $MERGE_TOOLS_DIR but we need th