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>
Bill Ritcher committed
Apr 5, 2018 at 08:55 UTC
6ceb658c9905cad2436810370c6590fc260a6b64
1 file changed
+18
mergetools/guiffy
new
+18
@@ -0,0 +1,18 @@
1
+diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
3
+}
4
+
5
+merge_cmd () {
6
+ if $base_present
7
+ then
8
+ "$merge_tool_path" -s "$LOCAL" \
9
+ "$REMOTE" "$BASE" "$MERGED"
10
+ else
11
+ "$merge_tool_path" -m "$LOCAL" \
12
+ "$REMOTE" "$MERGED"
13
+ fi
14
+}
15
+
16
+exit_code_trustable () {
17
+ true
18
+}