Mercurial > hg

diff contrib/editmerge @ 26615:c9223a3979b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.mergestate: add a wrapper around resolve The resolve function will be broken up into separate pre-resolve and resolve steps.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 18:29:50 -0700
parents 4b0fc75f9403
children 58b04a538caa
line wrap: on
line diff