diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-10-29 13:37:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-10-29 13:37:45 -0400 |
| commit | 3182cc6710ae85505aba9c670f434aad06d70e1c (patch) | |
| tree | a063d5645c124735790bd603d62ea35e1c2fa4ee /doc/rcs/monotone.mdwn | |
| parent | 309974dfa1dd16add0e042e2218e86c3d32f5a3e (diff) | |
| parent | f4f099e88e287e12f99c92950af5f8143dc4a8b8 (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
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]] |