diff tests/test-shelve.t @ 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 156985f2dec0
children 2dc363274702
line wrap: on
line diff