FitNesse.
ConcurrentSave
When two users of FitNesse try to save the same page at the same time, one of them will succeed, and one will get a merge dialog. The merge dialog presents two text boxes side by side. The first shows the user's modifications. The second shows the current saved contents of the page. The user makes the appropriate changes, and then hits the save button.

[ User Guide] [.FrontPage] [.RecentChanges]