tests/bundles/rebase.hg
author Martin von Zweigbergk <martinvonz@google.com>
Wed, 11 Feb 2015 22:22:29 -0800
changeset 26971 9f3410a52f44
parent 14119 624e5ce615ec
permissions -rw-r--r--
test-rename-merge2: make selected output less arbitrary It's unclear why everything from the first 'updating:' line should be ignored. The arbitrariness makes it confusing that changing the code so e.g. the 'getting 8/f' line is printed later makes it disappear completely from the ouput. The list of 'preserving x for resolve of y' seems convered by the subsequent for loop in the test case. Perhaps it's only copies that are of interests, so let's keep only that part.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
14119
624e5ce615ec tests: upgrade bundles/rebase.hg to support test-rebase-collapse
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 14118
diff changeset
     1
(binary:application/octet-stream)