diff doc/hgmerge.1.txt @ 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 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff