Mercurial > hg
annotate tests/bundles/issue4041.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 | ad9db007656f |
children |
rev | line source |
---|---|
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 (binary:application/octet-stream) |