Mercurial > hg
comparison mercurial/simplemerge.py @ 34416:55ef17ec8e59
effectflag: detect when user changed
Store in effect flag when the user changed between the predecessor and its
successors.
It can happens with "hg commit --amend -u" or "histedit".
Differential Revision: https://phab.mercurial-scm.org/D536
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 06 Jul 2017 14:53:48 +0200 |
| parents | 6330df9d6393 |
| children | 93c4958d987c |
comparison
equal
deleted
inserted
replaced
| 34415:51aadc0d0da2 | 34416:55ef17ec8e59 |
|---|