git-merge: fail correctly when we cannot fast forward.
[git/kusma.git] / git-gui / 
treefcd892d57e03be7b4baa1d97a94d8d969e4ed602
drwxr-xr-x   ..
-rw-r--r-- 49 .gitignore
-rwxr-xr-x 1598 CREDITS-GEN
-rwxr-xr-x 1814 GIT-VERSION-GEN
-rw-r--r-- 1508 Makefile
-rwxr-xr-x 150095 git-gui.sh