Mercurial > hg
comparison tests/test-hgweb-no-request-uri.t @ 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 | 91eb605022f5 |
children | ba7809b053fd |
comparison
equal
deleted
inserted
replaced
26617:dfd9811c5c9b | 26618:8e6d5b7317e6 |
---|