merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / t / t7500 /
drwxr-xr-x   parent (dest: t; base: b541248)
-rwxr-xr-x 88 add-comments
-rwxr-xr-x 47 add-content
-rwxr-xr-x 63 add-signed-off