summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorBill Ritcher <Bill_Ritcher@guiffy.com>2018-04-05 13:55:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-05 23:11:39 (GMT)
commit6ceb658c9905cad2436810370c6590fc260a6b64 (patch)
tree46c45c149fe7f442e5d0f4e7ed1e109d845fb7b3 /mergetools
parent468165c1d8a442994a825f3684528361727cd8c0 (diff)
downloadgit-6ceb658c9905cad2436810370c6590fc260a6b64.zip
git-6ceb658c9905cad2436810370c6590fc260a6b64.tar.gz
git-6ceb658c9905cad2436810370c6590fc260a6b64.tar.bz2
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> Reviewed-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
-rw-r--r--mergetools/guiffy18
1 files changed, 18 insertions, 0 deletions
diff --git a/mergetools/guiffy b/mergetools/guiffy
new file mode 100644
index 0000000..8b23a13
--- /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
+}