Mercurial > hg
comparison tests/test-trusted.py.out @ 27596:c881367688fe
test-copy-move-merge.t: explicitly request changed version
We're going to change the default for this in an upcoming patch, but in this
instance we do want to continue picking the changed version.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 23 Dec 2015 12:41:20 -0800 |
parents | fa91ddfc3f36 |
children | c4040a35b5d9 |
comparison
equal
deleted
inserted
replaced
27595:9e2d01707e71 | 27596:c881367688fe |
---|