diff hgeditor @ 27035:de7bf242644e

merge.mergestate: compute dirstate action In upcoming patches we're going to queue these actions up to be applied to the dirstate at the end.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 19 Nov 2015 10:50:02 -0800
parents 1aee2ab0f902
children
line wrap: on
line diff