merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: b541248467fa47979a34e3f1c5bbe3308fbdc4d1)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11322 Makefile
-rwxr-xr-x 74526 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows