t3506: validate '-m 1 -ff' is now accepted for non-merge commits

[git] / mergetools / diffuse

diff_cmd () {
        "$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

merge_cmd () {
        if $base_present
        then
                "$merge_tool_path" \
                        "$LOCAL" "$MERGED" "$REMOTE" \
                        "$BASE" | cat
        else
                "$merge_tool_path" \
                        "$LOCAL" "$MERGED" "$REMOTE" | cat
        fi
}