builtin-merge: refresh the index before calling a strategy
[git/jnareb-git.git] / git-gui / 
tree2ee7832031889e8ca002f3d1ca680ac32b835852
drwxr-xr-x   ..
-rw-r--r-- 84 .gitattributes
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11322 Makefile
-rwxr-xr-x 82445 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows