annotate tests/bundles/tampered.hg @ 26976:c48fee950ce4

debugmergestate: print out record type for files We're going to add a separate record type for change/delete conflicts soon. We need to make sure they get stored with the correct record type so that older versions of Mercurial correctly abort when they see change/delete records.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 13 Nov 2015 23:01:36 -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)