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 issues with my changes?
Jacob Nisnevich (1): mergetools: implemented new mergetool file for ExamDiff mergetools/examdiff | 20 ++++++++++++++++++++ mergetools/mergetools_helpers | 24 ++++++++++++++++++++++++ mergetools/winmerge | 23 +++-------------------- 3 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 mergetools/examdiff create mode 100644 mergetools/mergetools_helpers -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
