diff hgeditor @ 27088:e2b79f57903a

mergestate: add a way to record pending dirstate actions We're going to use this in resolve in the next patch.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 20 Nov 2015 16:55:01 -0800
parents 1aee2ab0f902
children
line wrap: on
line diff