Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deal with git behavior change in 1.7.8 and newer that broke support for commits with...
[git.ikiwiki.info.git]
/
doc
/
bugs
/
filecheck_failing_to_find_files.mdwn
diff --git
a/doc/bugs/filecheck_failing_to_find_files.mdwn
b/doc/bugs/filecheck_failing_to_find_files.mdwn
index f8d8e83e67755330cfb107e7a08e0bd69572beff..6501508e47afc879f665320a39292826333f34ea 100644
(file)
--- a/
doc/bugs/filecheck_failing_to_find_files.mdwn
+++ b/
doc/bugs/filecheck_failing_to_find_files.mdwn
@@
-25,6
+25,8
@@
It turns out that the filecheck plugin couldn't find the file, because it was me
>>>>>> Yes, it works! --[[KathrynAndersen]]
>>>>>> Yes, it works! --[[KathrynAndersen]]
+applied && [[done]]
+
<pre>
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index f59d026..0fc180f 100644
<pre>
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index f59d026..0fc180f 100644