* subversion/libsvn_client/conflicts.c   (get_keywords): Move further up in the file so it can be used by more    callers of svn_wc_merge5().
* subversion/libsvn_client/conflicts.c
  (get_keywords): Move further up in the file so it can be used by more
   callers of svn_wc_merge5().


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

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