Mercurial > hg
diff mercurial/commands.py @ 27089:dbb30bc16fc2
resolve: record dirstate actions after performing resolutions
Some resolutions might lead to pending actions we need to perform in the
dirstate -- so perform them.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sun, 15 Nov 2015 21:27:22 -0800 |
parents | ec37257341a9 |
children | 7a95c1e07487 |
line wrap: on
line diff