Mercurial > hg

diff setup.py @ 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 e8497889edab
children 7309853eedae
line wrap: on
line diff