aboutsummaryrefslogtreecommitdiff
path: root/mergetools/bc3
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/bc3')
-rw-r--r--mergetools/bc326
1 files changed, 1 insertions, 25 deletions
diff --git a/mergetools/bc3 b/mergetools/bc3
index b6319d206..5d8dd4818 100644
--- 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"