[PATCH] Add '-z' to merge-tree.c