Delete 2013-05-30-solving-three-way-git-merges-in-vimdiff.md