(merge): Less inaccurate error code (this is subtly different from being "more accurate", by the way).
(merge): Less inaccurate error code (this is subtly different from
being "more accurate", by the way).

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion