t / t5100 / msg0017on commit rebase: implement --merge via the interactive machinery (68aa495)
   1New content here
   2