* subversion/libsvn_subr/config_file.c   (svn_config_ensure): Fix typo in example 'interactive-conflicts' var    in generated conflict file.
* subversion/libsvn_subr/config_file.c
  (svn_config_ensure): Fix typo in example 'interactive-conflicts' var
   in generated conflict file.


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

YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion