comparison tests/test-dirstate-race.t @ 12664:545ec1775021

merge: handle no file parent in backwards merge (issue2364)
author Matt Mackall <mpm@selenic.com>
date Sat, 09 Oct 2010 14:50:20 -0500
parents 28e2e3804f2e
children c850f0ed54c1
comparison
equal deleted inserted replaced
12663:8269af351a64 12664:545ec1775021