comparison tests/test-merge2.t @ 37114:a8a0cafcef79

test-pathconflicts-merge: stop requiring symlink support The errors from the last time I took a shot at this back in early November have disappeared, so let's just enable this.
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 24 Mar 2018 22:10:58 -0400
parents f2719b387380
children 1850066f9e36
comparison
equal deleted inserted replaced
37113:704932ef8913 37114:a8a0cafcef79