[adgasf]

Google Docs solves the 95% case of version-control simply by bringing everyone to the head of master at all times.

[lrem]

And further 3% by having a linear revision history. With some luck it will even render diffs correctly.

Disclaimer: I work at Google and hate docs. But acknowledge the thing works ok for its intended user.