t / lib-httpd / passwdon commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1user@host:nKpa8pZUHx/ic