Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit builtin/apply: make add_conflicted_stages_file() return -1 on error (a902edc)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}