Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit git-p4: python3: replace dict.has_key(k) with "k in dict" (dba1c9d)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}
   8
   9exit_code_trustable () {
  10        true
  11}