cherry-pick/revert: add scissors line on merge conflict

[git] / t / t4018 / golang-struct

type RIGHT struct {
        a Type
        b ChangeMe
}