I've done emacs org mode on git, and it works. I've thankfully never had to do a manual merge, I wonder what org mode thinks of git merge commentary inside the file. I imagine you'd have to drop out of org mode and into text mode to fix the merge.

I've also used a wiki as what amounts to little more than a note taking app, and it works. There are a couple wikis that can speak git as a backend store.