Fix incorrect wording in git-merge.txt.
[git/jrn.git] / git-gui / 
tree2fe07a5d68628e0f8bf8cbe35b359a8f0416bed1
drwxr-xr-x   ..
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1812 GIT-VERSION-GEN
-rw-r--r-- 11167 Makefile
-rwxr-xr-x 70582 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows