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
add more details of CVE-2015-2793
[git.ikiwiki.info.git]
/
doc
/
bugs
/
conflicts.mdwn
diff --git
a/doc/bugs/conflicts.mdwn
b/doc/bugs/conflicts.mdwn
index a67450290f270f54ade7c04cc1ecf2ef2fde7d86..bef0f54cd4f5e6a2af361d6585eb00d3c157a326 100644
(file)
--- a/
doc/bugs/conflicts.mdwn
+++ b/
doc/bugs/conflicts.mdwn
@@
-28,3
+28,5
@@
destination file is rendered by multiple pages. Or when one page renders
a file that is a parent directory of the rendered file of another page.
It could warn, rather than erroring. The last page rendered would "win";
generating the destdir file.
+
+[[done]]