merge-recursive: leave unmerged entries in the index.
[git/jnareb-git.git] / debian / git-tk.files
blob478ec944047c6f93db56c66ca72b7054d7f1d5b7
1 /usr/bin/gitk
2 /usr/share/man/man1/gitk.*