annotate tests/bundles/tampered.hg @ 43873:8caec25f5d8f

merge: add commands.merge.require-rev to require an argument to hg merge This is related to commands.rebase.requiredest, commands.update.requiredest, and commands.push.require-revs. Since it isn't really a "destination", I went with require-rev to be similar to push's require-revs. Differential Revision: https://phab.mercurial-scm.org/D7620
author Kyle Lippincott <spectral@google.com>
date Wed, 11 Dec 2019 19:42:05 -0800
parents cd3032437064
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14116
cd3032437064 tests: move test bundles in a bundles/ subdirectory
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 7586
diff changeset
1 (binary:application/octet-stream)