Mercurial > hg

diff tests/test-merge5.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 fe80fdf68ba7
children 72072cfc7e91
line wrap: on
line diff