t / t4018 / golang-structon commit rerere: teach rerere to handle nested conflicts (4af3220)
   1type RIGHT struct {
   2        a Type
   3        b ChangeMe
   4}