projects
/
phpgitweb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
finished commitdiff page
[phpgitweb.git]
/
htdocs
/
templates
/
default
/
commitdiff.tpl
diff --git
a/htdocs/templates/default/commitdiff.tpl
b/htdocs/templates/default/commitdiff.tpl
index 398aa0c304ace115b6ddacd1f7d5dc71656cd153..ec42c02d3a646ee6eddb4732f62b4c44fbedf541 100644
(file)
--- 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>