Print conflict details with the new infrastructure (bug #11181)

[stgit] / templates / covermail.tmpl

diff --git a/templates/covermail.tmpl b/templates/covermail.tmpl
index d460f1b..5cf11b5 100644 (file)
--- a/templates/covermail.tmpl
+++ b/templates/covermail.tmpl
@@ -1,7 +1,11 @@
-From: %(maintainer)s
+From: %(sender)s
 Subject: [%(prefix)sPATCH%(version)s%(number)s] Series short description
 
 The following series implements...
 
+---
+
+%(shortlog)s
+%(diffstat)s
 -- 
 Signature