Merge branch 'rr/prompt-rebase-breakage-fix'

* rr/prompt-rebase-breakage-fix: prompt: squelch error output from cat

Junio C Hamano committed Jun 23, 2013 at 14:53 UTC 352e86e5431509b6834b6d22d139356b6ba6e1b9

No changes.