Re: [PATCH] mergetools: implemented new mergetool file for ExamDiff

2016-03-24 Thread Junio C Hamano
David Aguilar writes: > We can probably do this without introducing a new file. One > possible home for this is with the rest of the "default" > definitions of the functions in git-mergetool--lib.sh's > setup_tool() function. > > But, that hints that we expect tools to override it. > > A better

Re: [PATCH] mergetools: implemented new mergetool file for ExamDiff

2016-03-24 Thread David Aguilar
On Wed, Mar 23, 2016 at 03:55:45PM -0700, Jacob Nisnevich wrote: > Signed-off-by: Jacob Nisnevich > --- Please write commit message in an imperative tone. e.g. "mergetools: add support for ExamDiff" might be a good summary. > mergetools/examdiff | 20 > mergetool

[PATCH] mergetools: implemented new mergetool file for ExamDiff

2016-03-23 Thread Jacob Nisnevich
Signed-off-by: Jacob Nisnevich --- mergetools/examdiff | 20 mergetools/mergetools_helpers | 24 mergetools/winmerge | 23 +++ 3 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 mergetools/ex

[PATCH] mergetools: implemented new mergetool file for ExamDiff

2016-03-23 Thread Jacob Nisnevich
Thanks for the hint. I used the other examples to fix the implementation of the ExamDiff mergetool. I've tested the Winmerge and ExamDiff mergetools with both `git difftool` and `git mergetool` and both seem to work as expected. I've combined all my changes into one patch. Are there any other iss