Mercurial > hg

diff tests/test-merge-remove.t @ 27089:dbb30bc16fc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ddc17eaf0f1b
children 25e4b2f000c5
line wrap: on
line diff