aboutsummaryrefslogtreecommitdiff
path: root/mergetools/diffuse
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/diffuse')
-rw-r--r--mergetools/diffuse17
1 files changed, 17 insertions, 0 deletions
diff --git a/mergetools/diffuse b/mergetools/diffuse
new file mode 100644
index 000000000..02e0843f4
--- /dev/null
+++ b/mergetools/diffuse
@@ -0,0 +1,17 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
+}
+
+merge_cmd () {
+ touch "$BACKUP"
+ if $base_present
+ then
+ "$merge_tool_path" \
+ "$LOCAL" "$MERGED" "$REMOTE" \
+ "$BASE" | cat
+ else
+ "$merge_tool_path" \
+ "$LOCAL" "$MERGED" "$REMOTE" | cat
+ fi
+ check_unchanged
+}