mergetool: rename bc3 to bc
Beyond Compare version 4 works the same way as version 3, so rename the existing "bc3" adaptor to just "bc", while keeping "bc3" as a backward compatible wrapper. Noticed-by: Olivier Croquette <ocroquette@free.fr> Helped-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 20, 2014 at 15:49 UTC
f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6
4 files changed
+28
-27
contrib/completion/git-completion.bash
+1
-1
@@ -1207,7 +1207,7 @@ _git_diff ()
1207
}
1208
1209
__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
1210
- tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
1210
+ tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
1211
"
1212
1213
_git_difftool ()
git-mergetool--lib.sh
+1
-1
@@ -250,7 +250,7 @@ list_merge_tool_candidates () {
250
tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
251
fi
252
tools="$tools gvimdiff diffuse diffmerge ecmerge"
253
- tools="$tools p4merge araxis bc3 codecompare"
253
+ tools="$tools p4merge araxis bc codecompare"
254
fi
255
case "${VISUAL:-$EDITOR}" in
256
*vim*)
mergetools/bc
new
+25
@@ -0,0 +1,25 @@
1
+diff_cmd () {
2
+ "$merge_tool_path" "$LOCAL" "$REMOTE"
3
+}
4
+
5
+merge_cmd () {
6
+ touch "$BACKUP"
7
+ if $base_present
8
+ then
9
+ "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
10
+ -mergeoutput="$MERGED"
11
+ else
12
+ "$merge_tool_path" "$LOCAL" "$REMOTE" \
13
+ -mergeoutput="$MERGED"
14
+ fi
15
+ check_unchanged
16
+}
17
+
18
+translate_merge_tool_path() {
19
+ if type bcomp >/dev/null 2>/dev/null
20
+ then
21
+ echo bcomp
22
+ else
23
+ echo bcompare
24
+ fi
25
+}
mergetools/bc3
+1
-25
@@ -1,25 +1 @@
1
-diff_cmd () {
2
- "$merge_tool_path" "$LOCAL" "$REMOTE"
3
-}
4
-
5
-merge_cmd () {
6
- touch "$BACKUP"
7
- if $base_present
8
- then
9
- "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
10
- -mergeoutput="$MERGED"
11
- else
12
- "$merge_tool_path" "$LOCAL" "$REMOTE" \
13
- -mergeoutput="$MERGED"
14
- fi
15
- check_unchanged
16
-}
17
-
18
-translate_merge_tool_path() {
19
- if type bcomp >/dev/null 2>/dev/null
20
- then
21
- echo bcomp
22
- else
23
- echo bcompare
24
- fi
25
-}
1
+. "$MERGE_TOOLS_DIR/bc"