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
releasing version 3.20121016
[git.ikiwiki.info.git]
/
doc
/
todo
/
conflict_free_comment_merges.mdwn
diff --git
a/doc/todo/conflict_free_comment_merges.mdwn
b/doc/todo/conflict_free_comment_merges.mdwn
index 2cef0ee8cd3285f687c52f46b615d3e5aa07157b..e84400c172a3a8635bd7e33178b81c3b750aff06 100644
(file)
--- a/
doc/todo/conflict_free_comment_merges.mdwn
+++ b/
doc/todo/conflict_free_comment_merges.mdwn
@@
-20,4
+20,4
@@
What do you think [[smcv]]? --[[Joey]]
> are quite low since it modifies the input text and adds a date stamp to
> it.
>
-> Anyway, I think it's good, [[
[
done]] --[[Joey]]
+> Anyway, I think it's good, [[done]] --[[Joey]]