Never again accidentally run `commit –amend` in a merge conflict (fish script) (gist.github.com)