Print conflict details with the new infrastructure (bug #11181)
[stgit.git] / templates / 
tree5c12cb3c27de9a2eb84cb3b21928100223f1edca
drwxr-xr-x   ..
-rw-r--r-- 172 covermail.tmpl
-rw-r--r-- 437 mailattch.tmpl
-rw-r--r-- 84 patchexport.tmpl
-rw-r--r-- 133 patchmail.tmpl