t / t5100 / msg0015on commit completion: --edit and --no-edit for git-merge (aad0709)
   1  - a list
   2  - of stuff