t / t5100 / msg0017on commit add tests for rebasing merged history (3f21398)
   1New content here
   2