Fix "git-merge -s bogo" help text
[git/spearce.git] / git-gui / 
treef52ef4a2484aa75a67be922822f217cb1c4d7147
drwxr-xr-x   ..
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11186 Makefile
-rwxr-xr-x 74243 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows