t / t5100 / msg0015on commit am --skip: revert changes introduced by failed 3way merge (88d5072)
   1  - a list
   2  - of stuff