On 2013-11-25 10:59:10 -0500, Carlos Torres wrote: > so this all gets fixed if you merge in updates to config.def.h into > your config.h.
My recommendation if you are using two upstreams with git is to symlink config.h to config.def.h, and then just merge the one file. (although, there are like a million ways to do that well.)
pgpdMzk5Dzvx_.pgp
Description: PGP signature
