Show a failure of rebase -p if the merge had a conflict
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 03c4829347e26c844e589c61567a77a77c0658a9)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11490 Makefile
-rwxr-xr-x 1289 git-gui--askpass
-rwxr-xr-x 85326 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows