diff options
| -rw-r--r-- | doc/rcs/monotone.mdwn | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/rcs/monotone.mdwn b/doc/rcs/monotone.mdwn index 4711b6f4d..d79381571 100644 --- a/doc/rcs/monotone.mdwn +++ b/doc/rcs/monotone.mdwn @@ -12,6 +12,5 @@ Monotone support works, but there are still a few minor missing bits (listed her * At the moment there are no links to display diffs between revisions. It shouldn't be hard to add links to a [ViewMTN](http://grahame.angrygoats.net/moinmoin/ViewMTN) instance, but it hasn't been done yet. * The [[post-commit]] hook support, so that Ikiwiki sends change notifications when people commit using Monotone rather than the web interface, is partially implemented and untested. * Documentation (this page) could be improved. -* If you have both a conflict and a simultaneous rename on a file, then Ikiwiki may get confused. 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. |