git-merge-one-file: do not worry about 'rmdir -p' not removing directory.