mergetools / kompareon commit Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' (f70a50f)
   1can_merge () {
   2        return 1
   3}
   4
   5diff_cmd () {
   6        "$merge_tool_path" "$LOCAL" "$REMOTE"
   7}
   8
   9exit_code_trustable () {
  10        true
  11}