Mercurial > hg
comparison tests/test-pull-update.t @ 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 | 216cc65cf227 |
| children | 6b1fc09c699a |
comparison
equal
deleted
inserted
replaced
| 27088:e2b79f57903a | 27089:dbb30bc16fc2 |
|---|