{"thread":{"id":"48225","subject":"[PATCH] mergetools: add support for guiffy","startedAt":"2018-04-05T14:02:22Z","lastAt":"2018-04-05T17:07:28Z","messageCount":2,"participants":["Bill Ritcher","David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"343866","messageId":"20180405135501.12836-1-Bill_Ritcher@guiffy.com","threadId":"48225","inReplyTo":null,"subject":"[PATCH] mergetools: add support for guiffy","fromName":"Bill Ritcher","fromEmail":"bill_ritcher@guiffy.com","sentAt":"2018-04-05T13:55:01Z","receivedAt":"2018-04-05T14:02:22Z","isPatch":true,"sender":{"key":"bill_ritcher@guiffy.com","avatar":null},"body":"Add guiffy as difftool and mergetool\n\nguiffy is available on Windows, Linux, and MacOS\n\nSigned-off-by: Bill Ritcher <Bill_Ritcher@guiffy.com>\n---\n mergetools/guiffy | 18 ++++++++++++++++++\n 1 file changed, 18 insertions(+)\n create mode 100644 mergetools/guiffy\n\ndiff --git a/mergetools/guiffy b/mergetools/guiffy\nnew file mode 100644\nindex 000000000..8b23a13c4\n--- /dev/null\n+++ b/mergetools/guiffy\n@@ -0,0 +1,18 @@\n+diff_cmd () {\n+\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\"\n+}\n+\n+merge_cmd () {\n+\tif $base_present\n+\tthen\n+\t\t\"$merge_tool_path\" -s \"$LOCAL\" \\\n+\t\t\"$REMOTE\" \"$BASE\" \"$MERGED\"\n+\telse\n+\t\t\"$merge_tool_path\" -m \"$LOCAL\" \\\n+\t\t\"$REMOTE\" \"$MERGED\"\n+\tfi\n+}\n+\n+exit_code_trustable () {\n+\ttrue\n+}\n-- \n2.15.1.windows.2\n\n"},{"id":"343871","messageId":"20180405170717.GA32265@gmail.com","threadId":"48225","inReplyTo":"20180405135501.12836-1-Bill_Ritcher@guiffy.com","subject":"Re: [PATCH] mergetools: add support for guiffy","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2018-04-05T17:07:17Z","receivedAt":"2018-04-05T17:07:28Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"On Thu, Apr 05, 2018 at 08:55:01AM -0500, Bill Ritcher wrote:\n> Add guiffy as difftool and mergetool\n> \n> guiffy is available on Windows, Linux, and MacOS\n> \n> Signed-off-by: Bill Ritcher <Bill_Ritcher@guiffy.com>\n> ---\n>  mergetools/guiffy | 18 ++++++++++++++++++\n>  1 file changed, 18 insertions(+)\n>  create mode 100644 mergetools/guiffy\n> \n> diff --git a/mergetools/guiffy b/mergetools/guiffy\n> new file mode 100644\n> index 000000000..8b23a13c4\n> --- /dev/null\n> +++ b/mergetools/guiffy\n> @@ -0,0 +1,18 @@\n> +diff_cmd () {\n> +\t\"$merge_tool_path\" \"$LOCAL\" \"$REMOTE\"\n> +}\n> +\n> +merge_cmd () {\n> +\tif $base_present\n> +\tthen\n> +\t\t\"$merge_tool_path\" -s \"$LOCAL\" \\\n> +\t\t\"$REMOTE\" \"$BASE\" \"$MERGED\"\n> +\telse\n> +\t\t\"$merge_tool_path\" -m \"$LOCAL\" \\\n> +\t\t\"$REMOTE\" \"$MERGED\"\n> +\tfi\n> +}\n> +\n> +exit_code_trustable () {\n> +\ttrue\n> +}\n> -- \n> 2.15.1.windows.2\n\nI tested this on Linux and it works great.  Thanks Bill.\n\nAcked-by: David Aguilar <davvid@gmail.com>\n\ncheers,\n-- \nDavid\n"}]}