merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / Documentation / RelNotes-1.6.0.txt
2008-07-01 Merge branch 'jc/dashless' (early part)
2008-07-01 Merge branch 'nd/dashless'
2008-07-01 Only use GIT_CONFIG in "git config", not other programs
2008-06-30 Merge branch 'maint'
2008-06-30 Update draft release notes for 1.6.0
2008-06-29 Merge branch 'maint'
2008-06-27 Merge branch 'maint'
2008-06-26 Start draft release notes for 1.6.0