zZzzZ.

Delete git-merge-one-file?