Merge branch 'jk/gitweb-with-newer-cgi-multi-param' into maint

diff --git a/mergetools/bc3 b/mergetools/bc3
index b6319d206e2333e42469486604d4635e846e5faa..5d8dd4818488c1aa62750946d5490a99850e63b2 100644 (file)
--- a/mergetools/bc3
+++ b/mergetools/bc3
@@ -1,25 +1 @@
-diff_cmd () {
-       "$merge_tool_path" "$LOCAL" "$REMOTE"
-}
-
-merge_cmd () {
-       touch "$BACKUP"
-       if $base_present
-       then
-               "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
-                       -mergeoutput="$MERGED"
-       else
-               "$merge_tool_path" "$LOCAL" "$REMOTE" \
-                       -mergeoutput="$MERGED"
-       fi
-       check_unchanged
-}
-
-translate_merge_tool_path() {
-       if type bcomp >/dev/null 2>/dev/null
-       then
-               echo bcomp
-       else
-               echo bcompare
-       fi
-}
+. "$MERGE_TOOLS_DIR/bc"