* subversion/libsvn_wc/conflicts.c
  (eval_text_conflict_func_result,
   save_merge_result,
   resolve_text_conflict): Write full doc strings. Rename some path
    variables to indicate they are abspaths.

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