merge-recursive: comment and reorder the merge_options fields

[git] / t / t4018 / golang-long-func

func RIGHT(aVeryVeryVeryLongVariableName AVeryVeryVeryLongType,
        anotherLongVariableName AnotherLongType) {
        a := 5
        b := ChangeMe
}