Merge branch 'fc/prompt-zsh-read-from-file'
commit427ed406cda52f07b36dd8fe69c8c7ad6e6ae39a
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Apr 2014 18:17:22 +0000 (18 11:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Apr 2014 18:17:23 +0000 (18 11:17 -0700)
treea15236415fb167fa1e4ba3d25531610f88da2de8
parent3f0c02a1c018ddaced5c97b58f550b2ad17dd0a9
parent59d3924fbb300ebfe05f9079bcfe29d0a3f30661
Merge branch 'fc/prompt-zsh-read-from-file'

* fc/prompt-zsh-read-from-file:
  prompt: fix missing file errors in zsh