diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-20 15:49:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-21 11:25:30 -0700 |
| commit | f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6 (patch) | |
| tree | d3df13f1d784d7b1796a469900a7cb7928f96ae5 /mergetools | |
| parent | 3c2dc76f015b4d52ef02a08c59a4546d00b475e1 (diff) | |
| download | git-f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6.tar.gz git-f13f9b0eab8ec4880be0e4423ebdcfdbcd41eeb6.tar.xz | |
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>
Diffstat (limited to 'mergetools')
| -rw-r--r-- | mergetools/bc | 25 | ||||
| -rw-r--r-- | mergetools/bc3 | 26 |
2 files changed, 26 insertions, 25 deletions
diff --git a/mergetools/bc b/mergetools/bc new file mode 100644 index 000000000..b6319d206 --- /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 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" |