summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-29 17:08:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-29 17:08:04 (GMT)
commitc1777a297043a06d6c18d383d17447f5eefcdcbe (patch)
tree425021beccd0550006182fc43b52e56846551bce /mergetools
parentd70e331c0e8eaeb0bd75ae3020c3be71de075ff7 (diff)
parentf13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6 (diff)
downloadgit-c1777a297043a06d6c18d383d17447f5eefcdcbe.zip
git-c1777a297043a06d6c18d383d17447f5eefcdcbe.tar.gz
git-c1777a297043a06d6c18d383d17447f5eefcdcbe.tar.bz2
Merge branch 'oc/mergetools-beyondcompare'
* oc/mergetools-beyondcompare: mergetool: rename bc3 to bc
Diffstat (limited to 'mergetools')
-rw-r--r--mergetools/bc25
-rw-r--r--mergetools/bc326
2 files changed, 26 insertions, 25 deletions
diff --git a/mergetools/bc b/mergetools/bc
new file mode 100644
index 0000000..b6319d2
--- /dev/null
+++ b/mergetools/bc
@@ -0,0 +1,25 @@
+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
+}
diff --git a/mergetools/bc3 b/mergetools/bc3
index b6319d2..5d8dd48 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"