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

[stgit] / templates / patchmail.tmpl

diff --git a/templates/patchmail.tmpl b/templates/patchmail.tmpl
index 4724b5f..7d4022a 100644 (file)
--- a/templates/patchmail.tmpl
+++ b/templates/patchmail.tmpl
@@ -1,10 +1,7 @@
-From: %(commname)s <%(commemail)s>
-Subject: [PATCH %(patchnr)s/%(totalnr)s] %(shortdescr)s
-Date: %(date)s
-%(endofheaders)s
-%(longdescr)s
----
+From: %(sender)s
+Subject: [%(prefix)sPATCH%(version)s%(number)s] %(shortdescr)s
 
+%(fromauth)s%(longdescr)s
+---
 %(diffstat)s
-
 %(diff)s