Mercurial > hg
comparison contrib/docker/centos6 @ 26893:19c4b93cb7d6
filemerge: move :merge-local/other symlink check to precheck
In upcoming patches we're going to add more checks to the function currently
named _symlinkcheck. This consolidates all those checks.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sun, 08 Nov 2015 23:42:44 -0800 |
parents | 49ea49823769 |
children | af09413deb72 |
comparison
equal
deleted
inserted
replaced
26892:4b966aaadc45 | 26893:19c4b93cb7d6 |
---|