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

[stgit] / templates / patchmail.tmpl

diff --git a/templates/patchmail.tmpl b/templates/patchmail.tmpl
index 7881993..7d4022a 100644 (file)
--- a/templates/patchmail.tmpl
+++ b/templates/patchmail.tmpl
@@ -1,12 +1,7 @@
-From: %(maintainer)s
-Subject: [PATCH%(version)s%(number)s] %(shortdescr)s
-Date: %(date)s
-%(endofheaders)s
-From: %(authname)s <%(authemail)s>
+From: %(sender)s
+Subject: [%(prefix)sPATCH%(version)s%(number)s] %(shortdescr)s
 
-%(longdescr)s
+%(fromauth)s%(longdescr)s
 ---
-
 %(diffstat)s
-
 %(diff)s