about summary refs log tree commit diff
path: root/mergetools/xxdiff
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/xxdiff')
-rw-r--r--mergetools/xxdiff23
1 files changed, 23 insertions, 0 deletions
diff --git a/mergetools/xxdiff b/mergetools/xxdiff
new file mode 100644
index 000000000000..ce5b8e9f2962
--- /dev/null
+++ b/mergetools/xxdiff
@@ -0,0 +1,23 @@
+diff_cmd () {
+	"$merge_tool_path" \
+		-R 'Accel.Search: "Ctrl+F"' \
+		-R 'Accel.SearchForward: "Ctrl+G"' \
+		"$LOCAL" "$REMOTE"
+}
+
+merge_cmd () {
+	if $base_present
+	then
+		"$merge_tool_path" -X --show-merged-pane \
+			-R 'Accel.SaveAsMerged: "Ctrl+S"' \
+			-R 'Accel.Search: "Ctrl+F"' \
+			-R 'Accel.SearchForward: "Ctrl+G"' \
+			--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
+	else
+		"$merge_tool_path" -X $extra \
+			-R 'Accel.SaveAsMerged: "Ctrl+S"' \
+			-R 'Accel.Search: "Ctrl+F"' \
+			-R 'Accel.SearchForward: "Ctrl+G"' \
+			--merged-file "$MERGED" "$LOCAL" "$REMOTE"
+	fi
+}