merge-recursive: Cleanup and consolidation of rename_conflict_info
[gitweb.git] / po /
drwxr-xr-x   parent (dest: ; base: 4f66dade81c2ebc6e1143b6c116960bfcd837067)