Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>" (d0b30a3)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}