>> Regtested on i686-pc-linux-gnu with no failures. Ok for trunk? > OK. Thanks for the patch. I committed the patch as r139116 (without any changes to the error message for now). If people are really unhappy about the wording, it can still be changed later, together with the check_conflict messages. Cheers, Janus