merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / compat / snprintf.c
2008-03-09 Merge branch 'dp/clean-fix'
2008-03-09 Merge branch 'ml/submodule-add-existing'
2008-03-09 Merge branch 'mr/compat-snprintf'
2008-03-05 Add compat/snprintf.c for systems that return bogus