Update 2014-10-30-git-undoing-merge.md