Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit mingw: reencode environment variables on the fly (UTF-16 <-> UTF-8) (fe21c6b)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}
   8
   9exit_code_trustable () {
  10        true
  11}