diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2021-09-20 08:33:12 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-20 08:33:12 -0400 |
commit | 4f5653a4b524db88cf3e6c6744bb71ad2394b9b9 (patch) | |
tree | 462a93441d6b3a987470254b90d4de83d58a76a1 /tests/resources/revert-rename.git/index | |
parent | 3f36e7969049fcab328fa9521aadaaa22481884a (diff) | |
parent | 516f7519f0b0b38cabc6c98ff1428b46b1f20b3e (diff) | |
download | libgit2-4f5653a4b524db88cf3e6c6744bb71ad2394b9b9.tar.gz |
Merge pull request #6060 from ccstolley/ccs_merge_bugfix
merge: Check file mode when resolving renames
Diffstat (limited to 'tests/resources/revert-rename.git/index')
-rw-r--r-- | tests/resources/revert-rename.git/index | bin | 0 -> 209 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/resources/revert-rename.git/index b/tests/resources/revert-rename.git/index Binary files differnew file mode 100644 index 000000000..232325dfb --- /dev/null +++ b/tests/resources/revert-rename.git/index |