diff options
Diffstat (limited to 'third_party/git/mergetools/bc')
| -rw-r--r-- | third_party/git/mergetools/bc | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/third_party/git/mergetools/bc b/third_party/git/mergetools/bc deleted file mode 100644 index a89086ee720f..000000000000 --- a/third_party/git/mergetools/bc +++ /dev/null @@ -1,28 +0,0 @@ -diff_cmd () { - "$merge_tool_path" "$LOCAL" "$REMOTE" -} - -merge_cmd () { - if $base_present - then - "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \ - -mergeoutput="$MERGED" - else - "$merge_tool_path" "$LOCAL" "$REMOTE" \ - -mergeoutput="$MERGED" - fi -} - -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 -} |