t / t5100 / msg0017on commit am -3: support 3way merge on unborn branch (2c970c9)
   1New content here
   2