Merge branch 'jk/two-way-merge-corner-case-fix' into maint
[git] / gitk-git / .gitignore
1 /GIT-TCLTK-VARS
2 /gitk-wish