diff hgmerge @ 4584:0d26e3d0eeeb

Make parents with a file but not a revision use working directory revision.
author Brendan Cully <brendan@kublai.com>
date Thu, 14 Jun 2007 10:58:49 -0700
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff