merge-recursive: Fix code checking for D/F conflicts still being present
[gitweb.git] / po /
drwxr-xr-x   parent (dest: ; base: f2507b4e0ef0b7fc8c1e75004e8a86a0430dc512)