debian / git-tk.fileson commit Use git-merge instead of git-resolve in git-pull. (f887564)
   1/usr/bin/gitk
   2/usr/share/man/man1/gitk.*
   3/usr/share/doc/git-core/gitk.*