Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-basic.out @ 768:20e95c245bc3
Fix local file changes being ignored after non-branch merge
Bug introduced in eea96285cbf9
Spotted by TAH
author | mpm@selenic.com |
---|---|
date | Sat, 23 Jul 2005 10:00:56 -0500 |
parents | 0fb498458905 |
children | 853bfbf1a312 445970ccf57a |
line wrap: on
line source
+ mkdir t + cd t + hg init + echo a + hg add a + hg commit -m test -d '0 0' + hg history changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376 tag: tip user: test date: Thu Jan 1 00:00:00 1970 summary: test + hg manifest b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a + hg cat a a + hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions