summaryrefslogtreecommitdiffstats
path: root/mergetools/bc
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/bc')
-rw-r--r--mergetools/bc37
1 files changed, 37 insertions, 0 deletions
diff --git a/mergetools/bc b/mergetools/bc
new file mode 100644
index 0000000..2922667
--- /dev/null
+++ b/mergetools/bc
@@ -0,0 +1,37 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
+}
+
+diff_cmd_help () {
+ echo "Use Beyond Compare (requires a graphical session)"
+}
+
+merge_cmd () {
+ if $base_present
+ then
+ "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
+ -mergeoutput="$MERGED"
+ else
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
+ -mergeoutput="$MERGED"
+ fi
+}
+
+merge_cmd_help () {
+ echo "Use Beyond Compare (requires a graphical session)"
+}
+
+translate_merge_tool_path() {
+ if type bcomp >/dev/null 2>/dev/null
+ then
+ echo bcomp
+ else
+ echo bcompare
+ fi
+}
+
+list_tool_variants () {
+ echo bc
+ echo bc3
+ echo bc4
+}