Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 3661:61fdd25542a6
patch: offer the user a chance to fix the patch if it fails to apply
The experience is still not great, but better than purely dropping the changes.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 11 Apr 2018 07:23:34 +0200 |
| parents | d166b3dc5e8a |
| children | d5adce52cef4 f6979d64b9fb |
comparison
equal
deleted
inserted
replaced
| 3660:f018656ca3bf | 3661:61fdd25542a6 |
|---|