about summary refs log tree commit diff
path: root/third_party/git/mergetools/bc
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/mergetools/bc')
-rw-r--r--third_party/git/mergetools/bc23
1 files changed, 0 insertions, 23 deletions
diff --git a/third_party/git/mergetools/bc b/third_party/git/mergetools/bc
deleted file mode 100644
index 3a69e60faa..0000000000
--- a/third_party/git/mergetools/bc
+++ /dev/null
@@ -1,23 +0,0 @@
-diff_cmd () {
-	"$merge_tool_path" "$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-	if $base_present
-	then
-		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
-			-mergeoutput="$MERGED"
-	else
-		"$merge_tool_path" "$LOCAL" "$REMOTE" \
-			-mergeoutput="$MERGED"
-	fi
-}
-
-translate_merge_tool_path() {
-	if type bcomp >/dev/null 2>/dev/null
-	then
-		echo bcomp
-	else
-		echo bcompare
-	fi
-}