builtin-merge: allow using a custom strategy
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 87091b495e8af0daf317c0d0e08ac3ead74a0bb9)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11186 Makefile
-rwxr-xr-x 74243 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows