Hi, I'd like to use LyX + git (or some such VCS) to cooperatively edit documents. This requires a diff/merge tool that is LyX-aware and can result in LyX documents that contain diffs that users can merge manually. Are there any such tools? Thanks,
Nico --
