[Bug 578315] repairlink doesn't manage all files with conflicts