Page MenuHomePhabricator

flags: actually merge flags in simplemerge
ClosedPublic

Authored by marmoute on May 16 2020, 4:11 PM.

Details

Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.