Mercurial > hg

diff hgext/histedit.py @ 44911:84614212ae39 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e147748f750b
children b7808443ed6a 1bab6b61b62b
line wrap: on
line diff