Improve language in git-merge.txt and related docs
[git/mingw.git] / gitk-git / 
treefc5b3ddc0c36d20bdde99de79fc5c5be32a34362
drwxr-xr-x   ..
-rw-r--r-- 1771 Makefile
-rw-r--r-- 299700 gitk
drwxr-xr-x - po