Andrew's git / gitweb.git / mergetools/kompare
?
mergetools / kompareon commit run-command: drop silent_exec_failure arg from wait_or_whine (1327452)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}