X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/49f2356dda291fa2566136ad247cbceab30a3ba0..8aff1348e6fe0e11eb4266d9be1203f50ba3dedd:/doc/rcs/details.mdwn diff --git a/doc/rcs/details.mdwn b/doc/rcs/details.mdwn index b20abd389..449e129bd 100644 --- a/doc/rcs/details.mdwn +++ b/doc/rcs/details.mdwn @@ -62,7 +62,7 @@ rcs\_commit(). Is rcs\_prepedit() suitable? It follows that the HTML rendering and the CGI handling can be completely separated parts in ikiwiki. -What repository should [[RecentChanges]] and [[History]] work on? R1? +What repository should [[RecentChanges]] and History work on? R1? #### Rationale for doing it differently than in the Subversion case @@ -352,3 +352,5 @@ merge again with a merger that inserts conflict markers. It commits this new revision with conflict markers to the repository. It then returns the text to the user for cleanup. This is less neat than it could be, in that a conflict marked revision gets committed to the repository. + +## [[bzr]]