dirmerge: fix to prevent warnings with clang