[PATCH 2/2] mergetools: add support for ExamDiff

Signed-off-by: Jacob Nisnevich --- mergetools/examdiff | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 mergetools/examdiff diff --git a/mergetools/examdiff b/mergetools/examdiff new file mode 100644 index 000..7b524d4 --- /dev/null +++ b/mergetools/examdiff

[PATCH 1/2] mergetools: create mergetool_find_win32_cmd() helper function for winmerge

Signed-off-by: Jacob Nisnevich --- git-mergetool--lib.sh | 25 + mergetools/winmerge | 21 + 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 54ac8e4..302c56d 100644 --- a/git

[PATCH 0/2] mergetools: add support for ExamDiff

OK I add the quotes and modified the comment. I also changed $folder to $sub_directory. I think that makes a little bit more sense and sounds a lot better. Jacob Nisnevich (2): mergetools: create mergetool_find_win32_cmd() helper function for winmerge mergetools: add support for ExamDiff

[PATCH 2/2] mergetools: add support for ExamDiff

Signed-off-by: Jacob Nisnevich --- mergetools/examdiff | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 mergetools/examdiff diff --git a/mergetools/examdiff b/mergetools/examdiff new file mode 100644 index 000..7b524d4 --- /dev/null +++ b/mergetools/examdiff

[PATCH 1/2] mergetools: create mergetool_find_win32_cmd() helper function for winmerge

Signed-off-by: Jacob Nisnevich --- git-mergetool--lib.sh | 25 + mergetools/winmerge | 21 + 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 54ac8e4..c5fa820 100644 --- a/git

[PATCH 0/2] add support for ExamDiff

I implemented all the changes you suggested and separated the patch into two different patches. Thanks for all the help David. Jacob Nisnevich (2): mergetools: create mergetool_find_win32_cmd() helper function for winmerge mergetools: add support for ExamDiff git-mergetool--lib.sh | 25

[PATCH] mergetools: implemented new mergetool file for ExamDiff

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

[PATCH] mergetools: implemented new mergetool file for ExamDiff

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 fil

[PATCH 2/2] created helper function for both winmerge and examdiff mergetools

Signed-off-by: Jacob Nisnevich --- ...s-created-new-mergetool-file-for-ExamDiff.patch | 58 ++ mergetools/examdiff| 25 ++ mergetools/mergetools_helpers | 30 +++ mergetools/winmerge

[PATCH 0/2] Helper function for ExamDiff and Winmerge mergetools

thing I'm doing wrong or is it an issue with Windows? Jacob Nisnevich (2): mergetools: created new mergetool file for ExamDiff created helper function for both winmerge and examdiff mergetools ...s-created-new-mergetool-file-for-ExamDiff.patch | 58 ++

[PATCH 1/2] mergetools: created new mergetool file for ExamDiff

Signed-off-by: Jacob Nisnevich --- mergetools/examdiff | 37 + 1 file changed, 37 insertions(+) create mode 100644 mergetools/examdiff diff --git a/mergetools/examdiff b/mergetools/examdiff new file mode 100644 index 000..474fffe --- /dev/null +++ b

[PATCH] mergetools: created new mergetool file for ExamDiff

--- mergetools/examdiff | 37 + 1 file changed, 37 insertions(+) create mode 100644 mergetools/examdiff diff --git a/mergetools/examdiff b/mergetools/examdiff new file mode 100644 index 000..474fffe --- /dev/null +++ b/mergetools/examdiff @@ -0,0 +1,37 @@