Re: [PATCH] mergetool--lib: refactor {diff,merge}_cmd logic

2013-06-17 Thread Junio C Hamano
David Aguilar writes: > On Sun, Jun 16, 2013 at 10:51 AM, John Keeping wrote: >> Instead of needing a wrapper to call the diff/merge command, simply >> provide the diff_cmd and merge_cmd functions for user-specified tools in >> the same way as we do for built-in tools. >> >> Signed-off-by: John

Re: [PATCH] mergetool--lib: refactor {diff,merge}_cmd logic

2013-06-16 Thread David Aguilar
On Sun, Jun 16, 2013 at 10:51 AM, John Keeping wrote: > Instead of needing a wrapper to call the diff/merge command, simply > provide the diff_cmd and merge_cmd functions for user-specified tools in > the same way as we do for built-in tools. > > Signed-off-by: John Keeping > --- This is a nice

[PATCH] mergetool--lib: refactor {diff,merge}_cmd logic

2013-06-16 Thread John Keeping
Instead of needing a wrapper to call the diff/merge command, simply provide the diff_cmd and merge_cmd functions for user-specified tools in the same way as we do for built-in tools. Signed-off-by: John Keeping --- git-mergetool--lib.sh | 82 ++- 1