Mercurial > hg

view rustfmt.toml @ 46365:63dfaca9087f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add a hacktastic version of internal:merge3 for merge diffs This is a version of merge3 that always reports success, so that conflict markers get preserved without us having to implement conflict storage for in-memory merge. Credit to martinvonz for the idea. The only planned consumer of this "merge tool" is my upcoming merge-diffs functionality, though I suspect it could be useful in other ways. Differential Revision: https://phab.mercurial-scm.org/D8515
author Augie Fackler <augie@google.com>
date Mon, 11 May 2020 18:45:45 -0400
parents 426294d06ddc
children
line wrap: on
line source

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