Mercurial > hg

diff tests/test-merge-remove.t @ 33904:1915a5e809ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: use context paths for default labels instead of file paths This is the last place we used the filepath arguments without first using the context version. Differential Revision: https://phab.mercurial-scm.org/D379
author Phil Cohen <phillco@fb.com>
date Thu, 24 Aug 2017 21:30:37 -0700
parents 940c05b25b07
children 41ef02ba329b
line wrap: on
line diff