Mercurial > hg

comparison tests/test-commit-unresolved.t @ 26525:abc2327e382a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add some merge types We're going to turn the 'trymerge' boolean into a 'mergetype' enum with these three possible values.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 15:13:41 -0700
parents 3cbb5bf4035d
children ef1eb6df7071
comparison
equal deleted inserted replaced
26524:61c295d9d402 26525:abc2327e382a