git-pull doc: fix grammo ("conflicts" is plural)
[gitweb.git] / git-gui /
drwxr-xr-x   parent (dest: ; base: 38ef8a76e7c8c3e1be6e6ae96cfccc4191e9eac8)
-rwxr-xr-x 1813 GIT-VERSION-GEN
-rw-r--r-- 11667 Makefile
-rwxr-xr-x 1372 git-gui--askpass
-rwxr-xr-x 99192 git-gui.sh
drwxr-xr-x - lib
drwxr-xr-x - macosx
drwxr-xr-x - po
drwxr-xr-x - windows