r1748514 | stsp | 2016-06-15 08:01:06 +0000 (Wed, 15 Jun 2016)
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