Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit send-email: ask confirmation if given encoding name is very short (852a15d)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}