mergetools / ecmergeon commit t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks (c812bd4)
   1diff_cmd () {
   2        "$merge_tool_path" --default --mode=diff2 "$LOCAL" "$REMOTE"
   3}
   4
   5merge_cmd () {
   6        if $base_present
   7        then
   8                "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
   9                        --default --mode=merge3 --to="$MERGED"
  10        else
  11                "$merge_tool_path" "$LOCAL" "$REMOTE" \
  12                        --default --mode=merge2 --to="$MERGED"
  13        fi
  14}