privat/nit — pull request #422 by privat (2014-04-26 01:48:37+00:00)
Title: github_merge: copy the merge message for commit when conflict

so the following commit will be pre-rendered