Mercurial > hg

view rustfmt.toml @ 46781:1099ca176ba1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: don't pop stateextras when there are no conflicts on filemerge Even if `filemerge.filemerge()` didn't result in conflicts, we should not remove stateextras for a file since we now use that for more things than just merge time information. We use stateextras to store information which is required to be used by commit. I tracked this down while finding why a patch of mine which adds more commit related information does not work as expected and looses the extras in mergestate. Differential Revision: https://phab.mercurial-scm.org/D10148
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 10 Mar 2021 13:08:41 +0530
parents 426294d06ddc
children
line wrap: on
line source

edition = "2018"
max_width = 79
wrap_comments = true
error_on_line_overflow = true