ChiliProject is not maintained anymore. Please be advised that there will be no more updates.
We do not recommend that you setup new ChiliProject instances and we urge all existing users to migrate their data to a maintained system, e.g. Redmine. We will provide a migration script later. In the meantime, you can use the instructions by Christian Daehn.
Merging of Wiki Pages (Feature #751)
I have a tiny plugin (basically just a patch to WikiController) that uses the Ruby gem "Merge3" to merge Wiki pages if they have been edited concurrently. I would very much like to get that into core, so people can edit Wiki Pages at the same time and the later ones to press save then get the option of approving the merge and saving that.
Is there interest for that?