Merge branch 'rr/prompt-rebase-breakage-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:05 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:05 +0000 (14:53 -0700)
* rr/prompt-rebase-breakage-fix:
prompt: squelch error output from cat

Trivial merge