merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / git-gui / macosx /
2007-11-23 Merge branch 'maint'
2007-11-23 Merge branch 'maint'
2007-11-21 Merge git://repo.or.cz/git-gui