Documentation/git-merge-file: document option "--diff3"
[git/jrn.git] / gitk-git / .gitignore
blobd7ebcaf366f6a8cf403f04dd0582182181b69e51
1 /GIT-TCLTK-VARS
2 /gitk-wish