merge-recursive: Create function for merging with branchname:file markers
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: dac4741554e7672e69d1bc6b4f912cd16ad83b38)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11667 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 96857 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows