about summary refs log tree commit diff
path: root/third_party/git/mergetools/xxdiff
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/mergetools/xxdiff')
-rw-r--r--third_party/git/mergetools/xxdiff23
1 files changed, 0 insertions, 23 deletions
diff --git a/third_party/git/mergetools/xxdiff b/third_party/git/mergetools/xxdiff
deleted file mode 100644
index ce5b8e9f2962..000000000000
--- a/third_party/git/mergetools/xxdiff
+++ /dev/null
@@ -1,23 +0,0 @@
-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
-}