From: Jacob Nisnevich Date: Wed, 23 Mar 2016 22:55:44 GMT Subject: [PATCH] mergetools: implemented new mergetool file for ExamDiff Message-ID: <1458773745-783-1-git-send-email-jacob.nisnevich@gmail.com> In-Reply-To: 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