diff tests/test-merge4.t @ 35895:265e91da56fd

dirstate: drop deprecated methods (API) .. api:: beginparentchange() and endparentchange() have been replaced by the parentchange context manager.
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 02 Feb 2018 23:57:52 -0500
parents 63c817ea4a70
children 8561ad49915d
line wrap: on
line diff