* STATUS: Nominated issue #4370 '(m)erge interactive conflict resolution
  segfaults when cwd not parent of target' fix.


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