merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / gitk-git /
drwxr-xr-x   parent (dest: ; base: b541248)
-rw-r--r-- 1771 Makefile
-rw-r--r-- 274458 gitk
drwxr-xr-x - po