debian / git-tk.fileson commit Fall back to three-way merge when applying a patch. (47f0b6d)
   1/usr/bin/gitk
   2/usr/share/man/man1/gitk.*
   3/usr/share/doc/git-core/gitk.*