grep: allow -E and -n to be turned on by default via configuration
[gitweb.git] / t / t3309-notes-merge-auto-resolve.sh
2010-11-17 git notes merge: Add automatic conflict resolvers ...