Mercurial > hg
comparison tests/generate-working-copy-states.py @ 24709:69154e0ae384
strip: properly clear resolve state with --keep (issue4593)
Normal updates automatically clean up the resolve state, but strip
--keep does a "manual" update that bypasses the normal machinery. This
adds a mergestate reset.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 13 Apr 2015 07:42:25 -0500 |
| parents | 3849b89459b0 |
| children | a327a24acfea |
comparison
equal
deleted
inserted
replaced
| 24708:fb47816e1a9c | 24709:69154e0ae384 |
|---|