Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit Merge the attributes fix in from maint-1.6.6 branch (6c65b5e)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}