Fix incorrect wording in git-merge.txt.
[git/jnareb-git.git] / gitk-git / 
tree557b7096805a8a8fc4a09ed7faa89eeb96aafb82
drwxr-xr-x   ..
-rw-r--r-- 1610 Makefile
-rw-r--r-- 237852 gitk
drwxr-xr-x - po