Have merge conflicts marked up in 3-way style
I prefer the git-started project on github
Updating for saucy