[merge_dir] Change the way current-level-only merge is enforced to avoid log confusion.
[merge_dir] Change the way current-level-only merge is enforced to avoid log confusion.

Signed-off-by: Xiangyu Bu <83bd4065170ead433325a129c97cb9f216b4c6a3@live.com>

xybu/onedrived-dev