merge-recursive: comment and reorder the merge_options fields

[git] / t / t4018 / golang-interface

type RIGHT interface {
        a() Type
        b() ChangeMe
}