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.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion