Move a few functions in merge.c to a more sensible position, given that they
will be updated to the tree processor code in the near future.

First: Open, Change, Add, Delete, Close for files.
And then: Open, Change, Add, Delete, Close for directories.

No functional changes.

* subversion/libsvn_client/merge.c
  (merge_dir_props_changed): Move between the directory functions.
  (merge_dir_opened): Insert here.
  (merge_dir_props_changed): Insert here.
  (merge_dir_opened): Remove here.


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