annotate tests/bundles/remote.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 07708f4171f1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14117
07708f4171f1 tests: create a bundle to bootstrap tests using a remote repository
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
1 (binary:application/octet-stream)