Mercurial > hg

diff Makefile @ 26526:7fa3560443fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: switch trymerge boolean to mergetype enum trymerge = False becomes mergetype = nomerge, and trymerge = True becomes mergetype = fullmerge or mergeonly, depending on whether a premerge happens.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 16:14:57 -0700
parents 05306b9359d3
children c5c7c686d6a6
line wrap: on
line diff