diff tests/test-exchange-obsmarkers-case-A2.t @ 3473:b2f591aa4507

grab: add grab info to cmdutil.afterresolvedstates This will help us in showing how to continue the grab when user resolves all the conflicts.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 02 Feb 2018 15:37:00 +0530
parents 8feb2cae7eae
children ccfcacc5ee7c ef22eef37ecc
line wrap: on
line diff