Mercurial > hg

diff tests/test-double-merge.t @ 33083:05c680ebf512

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: convert repo.wwrite() calls to wctx[f].write() As with the previous patch in this series, workingfilectx.write() is a direct call to repo.wwrite(), so this change should be a no-op.
author Phil Cohen <phillco@fb.com>
date Sun, 25 Jun 2017 17:00:15 -0700
parents 564a354f7f35
children 91a0bc50b288
line wrap: on
line diff