On Sun, 23 Oct 2011 12:18:53 -0300, David Bremner <david@tethera.net> wrote: > From: David Bremner <bremner@debian.org> > > We keep the lib/xutil.c version. As a consequence, also factor out > _internal_error and associated macros. It might be overkill to make a > new file error_util.c for this, but _internal_error does not really > belong in database.cc. It seems this patch was sent out base64 encoded, which confuses git-am. I attach the patch here. You won't be able to git am this message, but you can at least save the attachment and apply it. Sorry for the inconvenience.