mergetools / kompareon commit Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint (b4e931d)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}