merge: fix GIT_EDITOR override for commit hook