* subversion/libsvn_wc/conflicts.c   (svn_wc_create_conflict_result): Initialise 'merged_value' (new in 1.9).
* subversion/libsvn_wc/conflicts.c
  (svn_wc_create_conflict_result): Initialise 'merged_value' (new in 1.9).


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

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