Follow-up to r25418, stop gcc shadowed declaration warnings.
Follow-up to r25418, stop gcc shadowed declaration warnings.

Suggested by: blair

* subversion/libsvn_client/merge.c
  (elide_mergeinfo): Tweak inner block variable name to not shadow argument
  to this function, remove unneeded redeclaration of local variable.


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

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