Make cherry-pick use rerere for conflict resolution.
[gitweb.git] / t / t5100-mailinfo.sh
2006-06-18 Merge branch 'js/diff'
2006-06-17 t5100: mailinfo and mailsplit tests.