revert: add "--strategy" option to choose merge strategy
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 91e525989665d69ace11b8f39618b1e8004fe19a)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11623 Makefile
-rwxr-xr-x 1289 git-gui--askpass
-rwxr-xr-x 92899 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows