Noam Postavsky wrote:
> Since git only runs the hooks on the merged changes when you pass
> --no-commit to 'git merge', defaulting to non-blind merge doesn't
> really work anyway.

Thanks for looking into this. I guess I'll have to rethink how I merge. In the 
meantime I installed the attached simpler patch, which doesn't bother with an 
environment variable and simply skips the checks in a two-way merge.