[PATCH] mergetools: add support for guiffy
Add guiffy as difftool and mergetool
guiffy is available on Windows, Linux, and MacOS
Signed-off-by: Bill Ritcher <Bill_Ritcher@guiffy.com>
---
mergetools/guiffy | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 mergetools/guiffy
diff --git a/mergetools/guiffy b/mergetools/guiffy
new file mode 100644
index 000000000..8b23a13c4
--- /dev/null
+++ b/mergetools/guiffy
@@ -0,0 +1,18 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+ if $base_present
+ then
+ "$merge_tool_path" -s "$LOCAL" \
+ "$REMOTE" "$BASE" "$MERGED"
+ else
+ "$merge_tool_path" -m "$LOCAL" \
+ "$REMOTE" "$MERGED"
+ fi
+}
+
+exit_code_trustable () {
+ true
+}
--
2.15.1.windows.2