tree d906a13f83099a5d09f2e1ea80c5f89de7674bcf
parent fef5344c50e33d01c08bec1687cb8a14a2a5efa2
author Edward Thomson <ethomson@microsoft.com> 1434489792 -0400
committer Edward Thomson <ethomson@microsoft.com> 1434489792 -0400

checkout: allow workdir to contain checkout target

When checking out some file 'foo' that has been modified in the
working directory, allow the checkout to proceed (do not conflict)
if 'foo' is identical to the target of the checkout.