* subversion/libsvn_client/merge.c
  (do_file_merge): Following up on r1441566, reset related variables in the
    same place instead of a few lines apart.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1441617 13f79535-47bb-0310-9956-ffa450edef68