merge-recursive: Have conflict_rename_delete reuse modify/delete code
[gitweb.git] / po /
drwxr-xr-x   parent (dest: ; base: e03acb8bc1f03827210235dd72578b8b26f19c51)