Mercurial > hg

diff tests/test-conflict.t @ 33085:1e79c66d6b07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
workingfilectx: add backgroundclose as a kwarg to write() This is necessary because some callers in merge.py pass backgroundclose=True when writing. As with previous changes in this series, this should be a no-op.
author Phil Cohen <phillco@fb.com>
date Sun, 25 Jun 2017 22:30:14 -0700
parents 1b5c61d38a52
children 8e6f4939a69a
line wrap: on
line diff