Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
glossary: more precise definition of tree-ish (a.k.a. treeish)
[gitweb.git]
/
mergetools
/
bc3
diff --git
a/mergetools/bc3
b/mergetools/bc3
index 27b3dd48b840139acd65ea742e04221c6400a485..b6319d206e2333e42469486604d4635e846e5faa 100644
(file)
--- 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
}