summaryrefslogtreecommitdiff
path: root/mergetools/guiffy
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/guiffy')
-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 0000000000..8b23a13c41
--- /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
+}