diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-09-22 14:04:19 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-09-22 14:11:47 +0000 |
commit | e17a444c651451724046e7da1ae2559e71478b3a (patch) | |
tree | c3a74bd35d3ff997e25038f6b373e8865512ef39 /tests/bscs-merge.pass | |
parent | 06f3271314b72e0065cc638fcfa7695d56ddb2e2 (diff) | |
download | tbdiff-master.tar.gz |
When a symlink hasn't changed from v1 to vu, we were using
by default v2. But this was failing in some cases where v2
didn't include this symlink.
Now, if v2 doesn't have that file, we use vu, to be consistent
with the behaviour of merging regular files.
Change-Id: I8741e0bd0722d48d3d031a779f5fbde6a4e86df7
Diffstat (limited to 'tests/bscs-merge.pass')
0 files changed, 0 insertions, 0 deletions