merge-recursive: comment and reorder the merge_options fields

[git] / t / t4018 / golang-struct

type RIGHT struct {
        a Type
        b ChangeMe
}