merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / Documentation / git-check-attr.txt
2007-04-26 Merge branch 'maint'
2007-04-25 Merge branch 'maint'
2007-04-25 Merge branch 'master' of git://repo.or.cz/git/fastimport
2007-04-24 Merge branch 'maint'
2007-04-22 Merge branch 'lt/objalloc'
2007-04-22 Merge branch 'jc/add'
2007-04-22 Merge branch 'jc/attr'
2007-04-15 Document git-check-attr