Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4 (0442743)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}