Improve language in git-merge.txt and related docs
[git/mingw.git] / git-gui / 
tree3bc7c4de922e7ad9662228b834fb3cca9afd39e9
drwxr-xr-x   ..
-rw-r--r-- 84 .gitattributes
-rw-r--r-- 97 .gitignore
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11490 Makefile
-rwxr-xr-x 1289 git-gui--askpass
-rwxr-xr-x 84983 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows