summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/opendiff')
-rw-r--r--mergetools/opendiff16
1 files changed, 16 insertions, 0 deletions
diff --git a/mergetools/opendiff b/mergetools/opendiff
new file mode 100644
index 0000000000..0942b2a733
--- /dev/null
+++ b/mergetools/opendiff
@@ -0,0 +1,16 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
+}
+
+merge_cmd () {
+ touch "$BACKUP"
+ if $base_present
+ then
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
+ -ancestor "$BASE" -merge "$MERGED" | cat
+ else
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
+ -merge "$MERGED" | cat
+ fi
+ check_unchanged
+}