diff tests/test-up-local-change.t @ 36976:a4a95bd7158d

filemerge: give some variables in _xmerge more descriptive names Differential Revision: https://phab.mercurial-scm.org/D2886
author Kyle Lippincott <spectral@google.com>
date Fri, 19 Jan 2018 18:52:50 -0800
parents eb586ed5d8ce
children 91a0bc50b288
line wrap: on
line diff