Mercurial > hg
annotate tests/bundles/issue4438-r1.hg @ 26618:8e6d5b7317e6
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 | c1f370dab456 |
children |
rev | line source |
---|---|
23233
c1f370dab456
discovery: test coverage for issue4438 / 86c35b7ae300 / 73cfaa348650
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
1 (binary:application/octet-stream) |