Change tabs to spaces (but nothing else) with Astyle
diffuse -c does not work with git branch merge commits
diffuse -c does not work with git branch merge operations