Fix compilation warning (shadowing of previous variable decl).
Fix compilation warning (shadowing of previous variable decl).

* subversion/libsvn_client/merge.c
  (discover_and_merge_children): Remove redundant declaration of local
   variable "i".  Add space-before-paren to flow control statement.


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

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