zZzzZ.

Delete git-merge-file?