[Sweepi]

TortoiseSVN (+Winmerge as diff tool) still is my go-to for non-programmers. If the person groks the windows explorer, TortoiseSVN just makes everything better and nothing worse. Log/History, Blame, Add, Update, ..: everything of importance is in the context menu. Also the trunk/stable model is more intuitive then "everybody has a branch and then there are merges, and merges of merges....".

Did show it to lawyer and he got it in an hour.