Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-help @ 862:d70c1c31fd45
Fix 3-way-merge of original parent, workdir and new parent.
The dirstate has to match what is in the repository (what would be
checked out with 'hg update -C'), because the resulting file may be
identical to the new parent, or it may be completely different.
Previously the dirstate wasn't updated, so if you changed the file to
look like the original parent, it might be considered unmodified
relative to the new parent.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 10 Aug 2005 06:47:46 +0100 |
parents | 8933ef744325 |
children | c2e77581bc84 d4cb383e7de7 62ec665759f2 01215ad04283 |
line wrap: on
line source
#!/bin/sh hg hg -q hg help hg -q help hg add -h hg add --skjdfks hg help diff hg help status hg -q help status hg help foo hg skjdfks exit 0