some changes ...

[phpgitweb.git] / htdocs / templates / default / commitdiff.tpl

diff --git a/htdocs/templates/default/commitdiff.tpl b/htdocs/templates/default/commitdiff.tpl
index 398aa0c304ace115b6ddacd1f7d5dc71656cd153..37d932e0f0bb29e5bf67ce10c335211924ccf70c 100644 (file)
--- a/htdocs/templates/default/commitdiff.tpl
+++ b/htdocs/templates/default/commitdiff.tpl
@@ -63,13 +63,19 @@
 </div>
 
 # [patch_link_blob]
-<a class="path" href="?p=%project%&a=blob&h=%hash%&f=%file%">%path%%file%</a>
+<a class="path" href="?p=%project%&a=blob&h=%hash%&f=%file%&fh=%file_hash%">%path%%file%</a>
 
 # [patch_link_blob_id]
-<a class="path" href="?p=%project%&a=blob&h=%hash%&f=%file%">%id%</a>
+<a class="path" href="?p=%project%&a=blob&h=%hash%&f=%file%&fh=%file_hash%">%id%</a>
 
 # [patch_fileinfo]
 <span class="info"> (%info%)</span>
 
 # [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>