diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-06-16 17:23:12 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-06-16 17:23:12 -0400 |
| commit | 892abf93157ea576fc3f2ccac118045a6a47247c (patch) | |
| tree | d906a13f83099a5d09f2e1ea80c5f89de7674bcf /src/diff.c | |
| parent | fef5344c50e33d01c08bec1687cb8a14a2a5efa2 (diff) | |
| download | libgit2-ethomson/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/diff.c')
0 files changed, 0 insertions, 0 deletions