Support a merge with conflicting gitlink change
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: ff72af00f86cbbaaab57c886c70f9799715ca02f)
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 10115 Makefile
-rwxr-xr-x 69906 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows