Fix a crash in 'svn resolve' (also affects 1.9.x).
Fix a crash in 'svn resolve' (also affects 1.9.x).

* subversion/libsvn_wc/conflicts.c
  (build_text_conflict_resolve_items): Before creating a merged version of a
   file for 'theirs-conflict' or 'mine-conflict' resolution, verify that all
   the necessary input files are actually available.

Found by: Gustavo Chaves <gustavo@gnustavo.com>
http://mail-archives.apache.org/mod_mbox/subversion-users/201606.mbox/%3CCAPx58qrVC%3Dbtr_z7nf9%2Bor5eaY4eNs7YFWZOzJR3SiBLY5qrvA%40mail.gmail.com%3E


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1748514 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion