mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-26 06:35:12 +02:00
Code

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>
This commit is contained in:
Bill Ritcher 2018-04-05 08:55:01 -05:00 committed by Junio C Hamano
parent 468165c1d8
commit 6ceb658c99
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mergetools/guiffy Normal file
View File

@ -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
}