send-email: add sendmail email aliases format
[gitweb.git] / t / t3309-notes-merge-auto-resolve.sh
2010-12-08 Merge branch 'gc/http-with-non-ascii-username-url'
2010-12-08 Merge branch 'ks/maint-getenv-fix'
2010-12-08 Merge branch 'gb/gitweb-remote-heads'
2010-12-08 Merge branch 'mg/maint-tag-rfc1991'
2010-12-08 Merge branch 'jh/notes-merge'
2010-11-17 git notes merge: Add another auto-resolving strategy...
2010-11-17 git notes merge: Add automatic conflict resolvers ...