Mercurial > hg
diff .hgtags @ 27074:78b0c88ab0db
mergestate._resolve: store return code and action for each file
We're going to need this to compute (a) updated/merged/unresolved counts, and
(b) actions to perform on the dirstate.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 20 Nov 2015 16:08:22 -0800 |
parents | db68fc04875c |
children | 33cb39084a1e |