merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / contrib / convert-objects /
drwxr-xr-x   parent (dest: contrib; base: b541248)
-rw-r--r-- 7433 convert-objects.c
-rw-r--r-- 456 git-convert-objects.txt