[PATCH] git-merge-one-file-script cleanups from Cogito