X-Git-Url: http://git.pk910.de/?p=phpgitweb.git;a=blobdiff_plain;f=htdocs%2Ftemplates%2Fdefault%2Fcommitdiff.tpl;fp=htdocs%2Ftemplates%2Fdefault%2Fcommitdiff.tpl;h=ec42c02d3a646ee6eddb4732f62b4c44fbedf541;hp=398aa0c304ace115b6ddacd1f7d5dc71656cd153;hb=07f0862d6ef4a14a812381a30931a46a51dbc87d;hpb=5a1b314c0a0ab8ed9be7b857c7996d8a3f87e7ed

diff --git a/htdocs/templates/default/commitdiff.tpl b/htdocs/templates/default/commitdiff.tpl
index 398aa0c..ec42c02 100644
--- a/htdocs/templates/default/commitdiff.tpl
+++ b/htdocs/templates/default/commitdiff.tpl
@@ -73,3 +73,9 @@
 
 # [patch_diffline]
 <div class="diff%class%">%line%</div>
+
+# [patch_nopatch_merge]
+<div class="diff nodifferences">Trivial merge</div>
+
+# [patch_nopatch_simple]
+<div class="diff nodifferences">No differences found</div>