* subversion/libsvn_client/merge.c   (do_directory_merge): Following up on r1442556, fix compilation after     last second before commit edit.
* subversion/libsvn_client/merge.c
  (do_directory_merge): Following up on r1442556, fix compilation after
    last second before commit edit.


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

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