Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / provide_sha1_for_git_diffurl.mdwn

diff --git a/doc/todo/provide_sha1_for_git_diffurl.mdwn b/doc/todo/provide_sha1_for_git_diffurl.mdwn
index 9c8b340de9882ac732a2926a5c305086dcdf1a8f..01aa512f8d5565a343df5e7818a9efda8a825b5f 100644 (file)
--- a/doc/todo/provide_sha1_for_git_diffurl.mdwn
+++ b/doc/todo/provide_sha1_for_git_diffurl.mdwn
@@ -10,7 +10,7 @@ diffurls of the following form:
     index 5bef928..164210d 100644
     --- a/IkiWiki/Plugin/git.pm
     +++ b/IkiWiki/Plugin/git.pm
-    @@ -518,6 +518,7 @@ sub rcs_recentchanges ($) { #{{{
+    @@ -518,6 +518,7 @@ sub rcs_recentchanges ($) {
      
                        my $diffurl = defined $config{'diffurl'} ? $config{'diffurl'} : "";
                        $diffurl =~ s/\[\[file\]\]/$file/go;