diff options
| author | intrigeri <intrigeri@boum.org> | 2008-11-02 13:11:00 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2008-11-02 13:11:00 +0100 |
| commit | 77136538788350ad2decaa445704ba5738074736 (patch) | |
| tree | acb6ea4f00bb43e78a829b1d84a42384c7f37f50 /doc/rcs/monotone.mdwn | |
| parent | fadb26bc1507f7fc2caaa873ad32c12f75c378aa (diff) | |
| parent | c2684b94b27c12b5e39bfbb026163b62842a9908 (diff) | |
| download | ikiwiki-77136538788350ad2decaa445704ba5738074736.tar ikiwiki-77136538788350ad2decaa445704ba5738074736.tar.gz | |
Merge commit 'origin/master' into prv/po
Diffstat (limited to 'doc/rcs/monotone.mdwn')
| -rw-r--r-- | doc/rcs/monotone.mdwn | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/rcs/monotone.mdwn b/doc/rcs/monotone.mdwn index babd5cf01..2cfcdfbf5 100644 --- a/doc/rcs/monotone.mdwn +++ b/doc/rcs/monotone.mdwn @@ -17,3 +17,8 @@ There is also a mismatch between the way Ikiwiki handles conflicts and the way Monotone handles conflicts. At present, if there is a conflict, then Ikiwiki will commit a revision with conflict markers before presenting it to the user. This is ugly, but there is no clean way to fix it at present. + +Also note that not all recent ikiwiki features have been implemented in the +monotone plugin. At the moment we're missing: + + * [[todo/Untrusted_push_in_Monotone]] |