* STATUS: Describe how to resolve merge conflict in r1306275 group.


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