Can anyone point me in the right direction - I am part of a development team and we are currently having issues with maintaining our documentation. We are looking for a repository management tool/plugin that will allow us to work on different versions of technical documentation at the same time and merge into the base documents when complete. Kind of like working on 2 branches of code and then merging into the trunk.
We would like something that would highlight conflicts in the documents and allow us to merge the conflicts.