Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit lockfile.c: make lock_file return a meaningful errno on failurei (447ff1b)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}