Use diff* with --exit-code in git-am, git-rebase and git-merge-ours
[git] / git-gui /
drwxr-xr-x   ..
-rw-r--r-- 36 .gitignore
-rwxr-xr-x 1814 GIT-VERSION-GEN
-rw-r--r-- 1612 Makefile
-rwxr-xr-x 149034 git-gui.sh