Merge branch 'rs/pretty-safety' * rs/pretty-safety: Make "--pretty=format" parser a bit more careful.