view tests/test-extra-filelog-entry.out @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents b51a8138292a
children
line wrap: on
line source

adding b
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       0 1e88685f5dde 000000000000 000000000000