Mercurial > hg

diff tests/test-merge-internal-tools-pattern.t @ 27027:a01ecbcfaf84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: handle additional record types specially This works around a bug in older Mercurial versions' handling of the v2 merge state. We also add a bunch of tests that make sure that (1) we correctly abort when the merge state has an unsupported record type (2) aborting the merge, rebase or histedit continues to work and clears out the merge state.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 18 Nov 2015 15:46:45 -0800
parents ff12a6c63c3d
children 41ef02ba329b
line wrap: on
line diff