merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / git-gui / lib / commit.tcl
2007-05-13 Merge branch 'maint'
2007-05-12 Merge branch 'maint'
2007-05-10 Merge branch 'master' of git://repo.or.cz/git-gui
2007-05-10 Merge branch 'maint'
2007-05-10 Merge branch 'maint'
2007-05-09 Merge branch 'jc/diffopt'
2007-05-09 Merge branch 'jn/gitweb'
2007-05-09 Merge branch 'maint'
2007-05-08 Merge branch 'master' of git://repo.or.cz/git-gui