Mercurial > hg

diff tests/test-wireproto.py.out @ 26618:8e6d5b7317e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.mergestate: perform all premerges before any merges (BC) We perform all that we can non-interactively before prompting the user for input via their merge tool. This allows for a maximally consistent state when the user is first prompted. The test output changes indicate the actual behavior change happening.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 21:56:39 -0700
parents d3d32643c060
children 40381a88bab4
line wrap: on
line diff