Pass empty file to p4merge where no base is suitable.
[gitweb.git] / git-gui / lib / sshkey.tcl
2008-11-03 Merge branch 'cj/maint-gitpm-fix-maybe-self'
2008-11-02 Merge branch 'maint'
2008-11-02 Merge git://repo.or.cz/git-gui