comparison mercurial/phases.py @ 33904:1915a5e809ca

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 57a017f79e96
children 5779d096a696
comparison
equal deleted inserted replaced
33903:ed6f64173121 33904:1915a5e809ca