merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / t / t9105-git-svn-commit-diff.sh
2006-07-10 Merge branch 'jc/mailinfo'
2006-07-10 Merge branch 'ew/diff'
2006-07-10 Merge branch 'ew/svn'
2006-07-07 git-svn: migrate out of contrib