X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=mergetools%2Fbc3;h=b6319d206e2333e42469486604d4635e846e5faa;hb=2f18b4642d6ea052cb6ad85f3a013a33b6afbe92;hp=27b3dd48b840139acd65ea742e04221c6400a485;hpb=278f7e6f6dc1b515f192daf836fe75d733435774;p=git.git diff --git a/mergetools/bc3 b/mergetools/bc3 index 27b3dd48b..b6319d206 100644 --- a/mergetools/bc3 +++ b/mergetools/bc3 @@ -16,5 +16,10 @@ merge_cmd () { } translate_merge_tool_path() { - echo bcompare + if type bcomp >/dev/null 2>/dev/null + then + echo bcomp + else + echo bcompare + fi }