From: Jean Privat <jean@pryen.org>
Date: Sat, 26 Apr 2014 01:11:04 +0000 (-0400)
Subject: github_merge: copy the merge message for commit when conflict
X-Git-Tag: v0.6.6~100^2
X-Git-Url: http://nitlanguage.org

github_merge: copy the merge message for commit when conflict

so the following commit will be pre-rendered

Signed-off-by: Jean Privat <jean@pryen.org>
---

diff --git a/contrib/github_merge.nit b/contrib/github_merge.nit
index f3c2da6..12cb829 100644
--- a/contrib/github_merge.nit
+++ b/contrib/github_merge.nit
@@ -107,6 +107,7 @@ else
 		return
 	end
 	if system("git merge --no-commit {sha}") != 0 then
+		system("cp mergemsg `git rev-parse --git-dir`/MERGE_MSG")
 		print "Problem during merge... Let's do the commit manually."
 		return
 	end