mergetools / kompareon commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}