Mercurial > hg

diff tests/test-merge-types.t @ 27005:3185c01c551c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: move _read() call to read constructor With this patch, mergestate.clean() will no longer abort when it encounters an unsupported merge type. However we hold off on testing it until backwards compatibility is in place.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 14:04:56 -0800
parents 7a8e9a985c3b
children 296d55def9c4
line wrap: on
line diff