* subversion/libsvn_client/merge.c
  (record_tree_conflict): Store a path that is less likely to break down.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1443453 13f79535-47bb-0310-9956-ffa450edef68