Mercurial > hg
comparison hgext/convert/common.py @ 44911:84614212ae39 stable
flags: actually merge flags in simplemerge
Since b86fc43e4b73, the local flag were blindly taken. This resulted in bug when
rename are involved. exec flag change are now properly merged (when merged from
the rename side).
Another bug is affecting this when merging from the side without the rename.
Differential Revision: https://phab.mercurial-scm.org/D8533
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 16 May 2020 20:38:19 +0200 |
| parents | 9f70512ae2cf |
| children | d96d8bbbedb1 |
comparison
equal
deleted
inserted
replaced
| 44910:783f059509e4 | 44911:84614212ae39 |
|---|