summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/p4merge')
-rw-r--r--mergetools/p4merge10
1 files changed, 10 insertions, 0 deletions
diff --git a/mergetools/p4merge b/mergetools/p4merge
new file mode 100644
index 0000000000..1a45c1b0c5
--- /dev/null
+++ b/mergetools/p4merge
@@ -0,0 +1,10 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+ touch "$BACKUP"
+ $base_present || >"$BASE"
+ "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+ check_unchanged
+}