Mercurial > hg
comparison tests/failfilemerge.py @ 50068:b35fb0e5b8d6
rollback: avoid a `hg commit --addremove` at a critical point
The rollback behavior around `hg commit --addremove` has changed slightly. It
does not really matters here but keeping that variant out of the way cannot
hurt.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 15 Feb 2023 23:39:10 +0100 |
| parents | 6000f5b25c9b |
| children |
comparison
equal
deleted
inserted
replaced
| 50067:059910ac7b76 | 50068:b35fb0e5b8d6 |
|---|