comparison tests/test-stablesort-branchpoint.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 064738ae1588
children 4303a46b4167 57030b9d71c3
comparison
equal deleted inserted replaced
3472:05bd493d496d 3473:b2f591aa4507