Mercurial > hg

diff tests/test-extdiff.t @ 26949:b639b2f186bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.applyupdates: only attempt to merge files in mergeactions This only makes a difference when a merge driver is active -- in that case we don't want to try and merge all the files, just the ones still unresolved after the merge driver's preprocess step is over.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 12 Nov 2015 14:29:02 -0800
parents 88c4e97b9669
children 0945539a3a6b
line wrap: on
line diff