Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Mar 2018 23:17:35 +0000 (15:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Mar 2018 23:17:35 +0000 (15:17 -0800)
* 'bb/ssh-key-files' of git-gui:
  git-gui: search for all current SSH key types

1  2 
git-gui/lib/sshkey.tcl

Simple merge