On Wed, 25 Jan 2012 23:37:45 +0200, Tomi Ollila <tomi.ollila@iki.fi> wrote:
> Changes to devel/uncrustify.cfg:

I'm not sure why (because there should not be intervening changes), but
this does not apply to current master. From git am -3, I get

,----
| Using index info to reconstruct a base tree...
| <stdin>:49: trailing whitespace.
| # or left operand of a binary multiplication operation. 
| error: patch failed: devel/uncrustify.cfg:107
| error: devel/uncrustify.cfg: patch does not apply
| Did you hand edit your patch?
| It does not apply to blobs recorded in its index.
| Cannot fall back to three-way merge.
| Patch failed at 0001 uncrustify.cfg: comments and more types
| When you have resolved this problem run "git am --resolved".
`----