* STATUS: Mark a merge conflict on a mostly unrelated file

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1482251 13f79535-47bb-0310-9956-ffa450edef68