Added missing status UPDATED_BY_MERGE Fixed parsing of file status FossilOrigin-Name: f82fab41453e6ccf28c60e89ce567635ffab25a3
FossilOrigin-Name: 717fb7a390f81af33ad40913960a30ff9c1c7a75
FossilOrigin-Name: 2e7553cddf1db1c9e22e883276829a8032dc9afb