merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / perl /
drwxr-xr-x   parent (dest: ; base: b541248)
-rw-r--r-- 35120 Git.pm
-rw-r--r-- 1391 Makefile
-rw-r--r-- 745 Makefile.PL
-rw-r--r-- 19088 private-Error.pm