summaryrefslogtreecommitdiff
path: root/src/unix
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2015-06-16 17:23:12 -0400
committerEdward Thomson <ethomson@microsoft.com>2015-06-16 17:23:12 -0400
commit892abf93157ea576fc3f2ccac118045a6a47247c (patch)
treed906a13f83099a5d09f2e1ea80c5f89de7674bcf /src/unix
parentfef5344c50e33d01c08bec1687cb8a14a2a5efa2 (diff)
downloadlibgit2-cmn/racy-diff.tar.gz
checkout: allow workdir to contain checkout targetethomson/racy-diffcmn/racy-diff
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.
Diffstat (limited to 'src/unix')
0 files changed, 0 insertions, 0 deletions