Merge branch 'en/merge-path-collision'

[git] / t / t4018 / golang-struct

type RIGHT struct {
        a Type
        b ChangeMe
}