Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tests for case sensitive conflicts in the index #345

Closed
wants to merge 1 commit into from
Closed

Tests for case sensitive conflicts in the index #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions LibGit2Sharp.Tests/ConflictFixture.cs
View file
Open in desktop
Expand Up @@ -14,6 +14,8 @@ public static IEnumerable<object[]> ConflictData
{ {
return new[] return new[]
{ {
new string[] { "DIFFERS-IN-CASE.TXT", "0a636a157ae305b03f3f4eb8c37fbfca7ab7564a", "e8f3bf056a12d2efa65f0a46f444e5eadb827913", "b607afb8beef6d80d8007c76f8600f3287d4b84c" },
new string[] { "Differs-In-Case.txt", "a1531c7e02a3aa4938858d6840a8b4859b188525", "920826a357cfa0867f8598e05038136c9d1a1f5e", "9dc12deeb6c9ed1746b788e3442df3e38e5deeae" },
new string[] { "ancestor-and-ours.txt", "5dee68477001f447f50fa7ee7e6a818370b5c2fb", "dad0664ae617d36e464ec08ed969ff496432b075", null }, new string[] { "ancestor-and-ours.txt", "5dee68477001f447f50fa7ee7e6a818370b5c2fb", "dad0664ae617d36e464ec08ed969ff496432b075", null },
new string[] { "ancestor-and-theirs.txt", "3aafd4d0bac33cc3c78c4c070f3966fb6e6f641a", null, "7b26cd5ac0ee68483ae4d5e1e00b064547ea8c9b" }, new string[] { "ancestor-and-theirs.txt", "3aafd4d0bac33cc3c78c4c070f3966fb6e6f641a", null, "7b26cd5ac0ee68483ae4d5e1e00b064547ea8c9b" },
new string[] { "ancestor-only.txt", "9736f4cd77759672322f3222ed3ddead1412d969", null, null }, new string[] { "ancestor-only.txt", "9736f4cd77759672322f3222ed3ddead1412d969", null, null },
Expand Down
10 changes: 10 additions & 0 deletions LibGit2Sharp.Tests/Resources/mergedrepo_wd/DIFFERS-IN-CASE.TXT
View file
Open in desktop
@@ -0,0 +1,10 @@
this will be a file that will be renamed
in "ours" to have a path that differs only
in case from a different file in "theirs"

<<<<<<< HEAD:DIFFERS-IN-CASE.TXT
of course it's edited in both...
=======
to produce a conflict, of course, it will
also be modified in "theirs"
>>>>>>> branch:case-sensitive-ancestor-one.txt
2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_HEAD
View file
Open in desktop
@@ -1 +1 @@
8eefb6f8061e4d10a7a59aac8771dc17958d93eb 1a5284b70c1b2a405ff99172b20c9d41cf56227a
2 changes: 2 additions & 0 deletions LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_MSG
View file
Open in desktop
@@ -1,6 +1,8 @@
Merge branch 'branch' Merge branch 'branch'


Conflicts: Conflicts:
DIFFERS-IN-CASE.TXT
Differs-In-Case.txt
ancestor-and-ours.txt ancestor-and-ours.txt
ancestor-and-theirs.txt ancestor-and-theirs.txt
ancestor-only.txt ancestor-only.txt
Expand Down
2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/ORIG_HEAD
View file
Open in desktop
@@ -1 +1 @@
9b2f98b1c086d3929eac387d39fae94425e0115f 1fb39db5a5c17e76627c8af5dda3e0143c9d3425
4 changes: 1 addition & 3 deletions LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/config
View file
Open in desktop
@@ -1,8 +1,6 @@
[core] [core]
repositoryformatversion = 0 repositoryformatversion = 0
filemode = false filemode = true
bare = false bare = false
logallrefupdates = true logallrefupdates = true
symlinks = false
ignorecase = true ignorecase = true
hideDotFiles = dotGitOnly
Binary file modified LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/index
View file
Open in desktop
Binary file not shown.
56 changes: 41 additions & 15 deletions LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD
View file
Open in desktop
@@ -1,15 +1,41 @@
0000000000000000000000000000000000000000 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632480 -0600 commit (initial): ancestor 0000000000000000000000000000000000000000 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361388250 -0600 commit (initial): initial revision
9107b30fe11ff310fec93876469147b263fb958c 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632483 -0600 checkout: moving from master to branch 2b76b92053e9efe82a0f14beb6ac7acfbb379152 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361388263 -0600 checkout: moving from master to theirs
9107b30fe11ff310fec93876469147b263fb958c d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360632833 -0600 commit: branch 2b76b92053e9efe82a0f14beb6ac7acfbb379152 13cec9650a916e4c56f25190374feaa7d5b2a7a0 Edward Thomson <ethomson@microsoft.com> 1361388388 -0600 commit: branch
d4c107581ff54a41fd496e0a1f1b7b3354752103 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632835 -0600 checkout: moving from branch to master 13cec9650a916e4c56f25190374feaa7d5b2a7a0 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361388397 -0600 checkout: moving from theirs to master
9107b30fe11ff310fec93876469147b263fb958c 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson <ethomson@microsoft.com> 1360633224 -0600 commit: ours 2b76b92053e9efe82a0f14beb6ac7acfbb379152 5a72e1a3f30b8293837a0a484b73cdb38b837af6 Edward Thomson <ethomson@microsoft.com> 1361389221 -0600 commit: master
8b19fd77de5995e6e502e7c3b82657248f510325 91116bad97c50a2daa278ca6cffe16d0118befe5 Edward Thomson <ethomson@microsoft.com> 1360633337 -0600 commit: ours 5a72e1a3f30b8293837a0a484b73cdb38b837af6 c36b153fea52530b41949987577542eec6312282 Edward Thomson <ethomson@microsoft.com> 1361389283 -0600 commit: master
91116bad97c50a2daa278ca6cffe16d0118befe5 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson <ethomson@microsoft.com> 1360633358 -0600 checkout: moving from master to 8b19fd7 c36b153fea52530b41949987577542eec6312282 5a72e1a3f30b8293837a0a484b73cdb38b837af6 Edward Thomson <ethomson@microsoft.com> 1361389302 -0600 checkout: moving from master to 5a72e1a
8b19fd77de5995e6e502e7c3b82657248f510325 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 1360633359 -0600 rebase -i (squash): ours 5a72e1a3f30b8293837a0a484b73cdb38b837af6 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361389302 -0600 rebase -i (squash): updating HEAD
9b2f98b1c086d3929eac387d39fae94425e0115f 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 1360633362 -0600 rebase -i (finish): returning to refs/heads/master 2b76b92053e9efe82a0f14beb6ac7acfbb379152 3e1bdb064a067e4ef4c70f1c0e237a114212e24e Edward Thomson <ethomson@microsoft.com> 1361389302 -0600 rebase -i (squash): master
9b2f98b1c086d3929eac387d39fae94425e0115f d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360633367 -0600 checkout: moving from master to branch 3e1bdb064a067e4ef4c70f1c0e237a114212e24e 3e1bdb064a067e4ef4c70f1c0e237a114212e24e Edward Thomson <ethomson@microsoft.com> 1361389306 -0600 rebase -i (finish): returning to refs/heads/master
d4c107581ff54a41fd496e0a1f1b7b3354752103 493209f496e504d63fd78e8c5b800083b442ea34 Edward Thomson <ethomson@microsoft.com> 1360633416 -0600 commit: branch 3e1bdb064a067e4ef4c70f1c0e237a114212e24e 8b892154edc67fd70272f3aec4c343d3c0288781 Edward Thomson <ethomson@microsoft.com> 1361389647 -0600 commit: foo
493209f496e504d63fd78e8c5b800083b442ea34 d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360633427 -0600 checkout: moving from branch to d4c1075 8b892154edc67fd70272f3aec4c343d3c0288781 3e1bdb064a067e4ef4c70f1c0e237a114212e24e Edward Thomson <ethomson@microsoft.com> 1361389657 -0600 checkout: moving from master to 3e1bdb0
d4c107581ff54a41fd496e0a1f1b7b3354752103 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson <ethomson@microsoft.com> 1360633429 -0600 rebase -i (squash): branch 3e1bdb064a067e4ef4c70f1c0e237a114212e24e 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361389657 -0600 rebase -i (squash): updating HEAD
8eefb6f8061e4d10a7a59aac8771dc17958d93eb 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson <ethomson@microsoft.com> 1360633436 -0600 rebase -i (finish): returning to refs/heads/branch 2b76b92053e9efe82a0f14beb6ac7acfbb379152 53e30938e49c5fcea36d7d6f5957e4e57983ddd4 Edward Thomson <ethomson@microsoft.com> 1361389657 -0600 rebase -i (squash): master
8eefb6f8061e4d10a7a59aac8771dc17958d93eb 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 1360633440 -0600 checkout: moving from branch to master 53e30938e49c5fcea36d7d6f5957e4e57983ddd4 53e30938e49c5fcea36d7d6f5957e4e57983ddd4 Edward Thomson <ethomson@microsoft.com> 1361389659 -0600 rebase -i (finish): returning to refs/heads/master
53e30938e49c5fcea36d7d6f5957e4e57983ddd4 13cec9650a916e4c56f25190374feaa7d5b2a7a0 Edward Thomson <ethomson@microsoft.com> 1361389670 -0600 checkout: moving from master to branch
13cec9650a916e4c56f25190374feaa7d5b2a7a0 de789ec44c23aaff846394af42989f68cf839201 Edward Thomson <ethomson@microsoft.com> 1361389786 -0600 commit: foo
de789ec44c23aaff846394af42989f68cf839201 13cec9650a916e4c56f25190374feaa7d5b2a7a0 Edward Thomson <ethomson@microsoft.com> 1361389793 -0600 checkout: moving from branch to 13cec96
13cec9650a916e4c56f25190374feaa7d5b2a7a0 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361389794 -0600 rebase -i (squash): updating HEAD
2b76b92053e9efe82a0f14beb6ac7acfbb379152 f5368e572a1034743cbb728451dce4633a834781 Edward Thomson <ethomson@microsoft.com> 1361389794 -0600 rebase -i (squash): branch
f5368e572a1034743cbb728451dce4633a834781 f5368e572a1034743cbb728451dce4633a834781 Edward Thomson <ethomson@microsoft.com> 1361389795 -0600 rebase -i (finish): returning to refs/heads/branch
f5368e572a1034743cbb728451dce4633a834781 53e30938e49c5fcea36d7d6f5957e4e57983ddd4 Edward Thomson <ethomson@microsoft.com> 1361389800 -0600 checkout: moving from branch to master
53e30938e49c5fcea36d7d6f5957e4e57983ddd4 f5368e572a1034743cbb728451dce4633a834781 Edward Thomson <ethomson@microsoft.com> 1361389832 -0600 checkout: moving from master to branch
f5368e572a1034743cbb728451dce4633a834781 1249d12517e2735c3aa90e3a4d3e2fd45fcbe729 Edward Thomson <ethomson@microsoft.com> 1361389854 -0600 commit: branch
1249d12517e2735c3aa90e3a4d3e2fd45fcbe729 f5368e572a1034743cbb728451dce4633a834781 Edward Thomson <ethomson@microsoft.com> 1361389861 -0600 checkout: moving from branch to f5368e5
f5368e572a1034743cbb728451dce4633a834781 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361389861 -0600 rebase -i (squash): updating HEAD
2b76b92053e9efe82a0f14beb6ac7acfbb379152 6056409e3075f145072e623491007723326df3b9 Edward Thomson <ethomson@microsoft.com> 1361389861 -0600 rebase -i (squash): branch
6056409e3075f145072e623491007723326df3b9 6056409e3075f145072e623491007723326df3b9 Edward Thomson <ethomson@microsoft.com> 1361389863 -0600 rebase -i (finish): returning to refs/heads/branch
6056409e3075f145072e623491007723326df3b9 53e30938e49c5fcea36d7d6f5957e4e57983ddd4 Edward Thomson <ethomson@microsoft.com> 1361389870 -0600 checkout: moving from branch to master
53e30938e49c5fcea36d7d6f5957e4e57983ddd4 381740f5bae5d776f0ab5d1bbd06f6b5f2191c7d Edward Thomson <ethomson@microsoft.com> 1361390064 -0600 commit: master
381740f5bae5d776f0ab5d1bbd06f6b5f2191c7d 53e30938e49c5fcea36d7d6f5957e4e57983ddd4 Edward Thomson <ethomson@microsoft.com> 1361390073 -0600 checkout: moving from master to 53e3093
53e30938e49c5fcea36d7d6f5957e4e57983ddd4 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361390073 -0600 rebase -i (squash): updating HEAD
2b76b92053e9efe82a0f14beb6ac7acfbb379152 1fb39db5a5c17e76627c8af5dda3e0143c9d3425 Edward Thomson <ethomson@microsoft.com> 1361390073 -0600 rebase -i (squash): master
1fb39db5a5c17e76627c8af5dda3e0143c9d3425 1fb39db5a5c17e76627c8af5dda3e0143c9d3425 Edward Thomson <ethomson@microsoft.com> 1361390075 -0600 rebase -i (finish): returning to refs/heads/master
1fb39db5a5c17e76627c8af5dda3e0143c9d3425 6056409e3075f145072e623491007723326df3b9 Edward Thomson <ethomson@microsoft.com> 1361390078 -0600 checkout: moving from master to branch
6056409e3075f145072e623491007723326df3b9 08dcaefb23daaf07d96afcd42e603d328721a20c Edward Thomson <ethomson@microsoft.com> 1361390098 -0600 commit: branch
08dcaefb23daaf07d96afcd42e603d328721a20c 6056409e3075f145072e623491007723326df3b9 Edward Thomson <ethomson@microsoft.com> 1361390104 -0600 checkout: moving from branch to 6056409
6056409e3075f145072e623491007723326df3b9 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361390104 -0600 rebase -i (squash): updating HEAD
2b76b92053e9efe82a0f14beb6ac7acfbb379152 1a5284b70c1b2a405ff99172b20c9d41cf56227a Edward Thomson <ethomson@microsoft.com> 1361390104 -0600 rebase -i (squash): branch
1a5284b70c1b2a405ff99172b20c9d41cf56227a 1a5284b70c1b2a405ff99172b20c9d41cf56227a Edward Thomson <ethomson@microsoft.com> 1361390105 -0600 rebase -i (finish): returning to refs/heads/branch
1a5284b70c1b2a405ff99172b20c9d41cf56227a 1fb39db5a5c17e76627c8af5dda3e0143c9d3425 Edward Thomson <ethomson@microsoft.com> 1361390112 -0600 checkout: moving from branch to master
10 changes: 6 additions & 4 deletions LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch
View file
Open in desktop
@@ -1,4 +1,6 @@
0000000000000000000000000000000000000000 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632483 -0600 branch: Created from HEAD 13cec9650a916e4c56f25190374feaa7d5b2a7a0 de789ec44c23aaff846394af42989f68cf839201 Edward Thomson <ethomson@microsoft.com> 1361389786 -0600 commit: foo
9107b30fe11ff310fec93876469147b263fb958c d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360632833 -0600 commit: branch de789ec44c23aaff846394af42989f68cf839201 f5368e572a1034743cbb728451dce4633a834781 Edward Thomson <ethomson@microsoft.com> 1361389795 -0600 rebase -i (finish): refs/heads/branch onto 13cec96
d4c107581ff54a41fd496e0a1f1b7b3354752103 493209f496e504d63fd78e8c5b800083b442ea34 Edward Thomson <ethomson@microsoft.com> 1360633416 -0600 commit: branch f5368e572a1034743cbb728451dce4633a834781 1249d12517e2735c3aa90e3a4d3e2fd45fcbe729 Edward Thomson <ethomson@microsoft.com> 1361389854 -0600 commit: branch
493209f496e504d63fd78e8c5b800083b442ea34 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson <ethomson@microsoft.com> 1360633436 -0600 rebase -i (finish): refs/heads/branch onto d4c1075 1249d12517e2735c3aa90e3a4d3e2fd45fcbe729 6056409e3075f145072e623491007723326df3b9 Edward Thomson <ethomson@microsoft.com> 1361389863 -0600 rebase -i (finish): refs/heads/branch onto f5368e5
6056409e3075f145072e623491007723326df3b9 08dcaefb23daaf07d96afcd42e603d328721a20c Edward Thomson <ethomson@microsoft.com> 1361390098 -0600 commit: branch
08dcaefb23daaf07d96afcd42e603d328721a20c 1a5284b70c1b2a405ff99172b20c9d41cf56227a Edward Thomson <ethomson@microsoft.com> 1361390105 -0600 rebase -i (finish): refs/heads/branch onto 6056409
12 changes: 8 additions & 4 deletions LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master
View file
Open in desktop
@@ -1,4 +1,8 @@
0000000000000000000000000000000000000000 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632480 -0600 commit (initial): ancestor 0000000000000000000000000000000000000000 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361388250 -0600 commit (initial): initial revision
9107b30fe11ff310fec93876469147b263fb958c 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson <ethomson@microsoft.com> 1360633224 -0600 commit: ours 2b76b92053e9efe82a0f14beb6ac7acfbb379152 5a72e1a3f30b8293837a0a484b73cdb38b837af6 Edward Thomson <ethomson@microsoft.com> 1361389221 -0600 commit: master
8b19fd77de5995e6e502e7c3b82657248f510325 91116bad97c50a2daa278ca6cffe16d0118befe5 Edward Thomson <ethomson@microsoft.com> 1360633337 -0600 commit: ours 5a72e1a3f30b8293837a0a484b73cdb38b837af6 c36b153fea52530b41949987577542eec6312282 Edward Thomson <ethomson@microsoft.com> 1361389283 -0600 commit: master
91116bad97c50a2daa278ca6cffe16d0118befe5 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 1360633362 -0600 rebase -i (finish): refs/heads/master onto 8b19fd7 c36b153fea52530b41949987577542eec6312282 3e1bdb064a067e4ef4c70f1c0e237a114212e24e Edward Thomson <ethomson@microsoft.com> 1361389306 -0600 rebase -i (finish): refs/heads/master onto 5a72e1a
3e1bdb064a067e4ef4c70f1c0e237a114212e24e 8b892154edc67fd70272f3aec4c343d3c0288781 Edward Thomson <ethomson@microsoft.com> 1361389647 -0600 commit: foo
8b892154edc67fd70272f3aec4c343d3c0288781 53e30938e49c5fcea36d7d6f5957e4e57983ddd4 Edward Thomson <ethomson@microsoft.com> 1361389659 -0600 rebase -i (finish): refs/heads/master onto 3e1bdb0
53e30938e49c5fcea36d7d6f5957e4e57983ddd4 381740f5bae5d776f0ab5d1bbd06f6b5f2191c7d Edward Thomson <ethomson@microsoft.com> 1361390064 -0600 commit: master
381740f5bae5d776f0ab5d1bbd06f6b5f2191c7d 1fb39db5a5c17e76627c8af5dda3e0143c9d3425 Edward Thomson <ethomson@microsoft.com> 1361390075 -0600 rebase -i (finish): refs/heads/master onto 53e3093
2 changes: 2 additions & 0 deletions LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/theirs
View file
Open in desktop
@@ -0,0 +1,2 @@
0000000000000000000000000000000000000000 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361388263 -0600 branch: Created from HEAD
2b76b92053e9efe82a0f14beb6ac7acfbb379152 13cec9650a916e4c56f25190374feaa7d5b2a7a0 Edward Thomson <ethomson@microsoft.com> 1361388388 -0600 commit: branch
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/02/8be3f2ea84cb689b3c2f40da4023bc93faf4ba
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/08/dcaefb23daaf07d96afcd42e603d328721a20c
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/0a/636a157ae305b03f3f4eb8c37fbfca7ab7564a
View file
Open in desktop
@@ -0,0 +1 @@
x=�A�0 DѮ9ň���q��-��J UoQ�ng�~2OX��+D�j�� d5F��\��}҂���f�C���C!C�3�/��t���ՏG��K�z��>��-�
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/11/c7159b2cff4b5dde07dde7a1db09a3389e16a6
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/12/49d12517e2735c3aa90e3a4d3e2fd45fcbe729
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/13/cec9650a916e4c56f25190374feaa7d5b2a7a0
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/1a/5284b70c1b2a405ff99172b20c9d41cf56227a
View file
Open in desktop
Binary file not shown.
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/1c/b365141a52dfbb24933515820eb3045fbca12b
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/1f/b39db5a5c17e76627c8af5dda3e0143c9d3425
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/2b/76b92053e9efe82a0f14beb6ac7acfbb379152
View file
Open in desktop
Binary file not shown.
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/37/59e38c9b3ce50a318174970229351a039d7571
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/38/1740f5bae5d776f0ab5d1bbd06f6b5f2191c7d
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/3e/1bdb064a067e4ef4c70f1c0e237a114212e24e
View file
Open in desktop
@@ -0,0 +1,2 @@
x��A!=�
>���]c��?� Cv�a1~_L���N���\Kٺ6�zќ��d�#�.��� ����>9��McH��``�d�M�� ��K�Ld���Q�����-�cK��ֲׇ>ˠ�t-����O\�E�uh}0��t��‚�)T���8L7
1 change: 1 addition & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/44/c8a5fb4ada4347d15b0c7bf6403f91af810b9e
View file
Open in desktop
@@ -0,0 +1 @@
x�1�0P��i⬳G�B-�B#���^~<c?��Yj����R�S�Ӡ�B��z��+i�Un�J1�ż����
Expand Down
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/49/3209f496e504d63fd78e8c5b800083b442ea34
View file
Open in desktop
Binary file not shown.
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/4e/b4293b45001605eaaa24fd81201071bf020276
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/50/72f78b82f5deb4587736cf86c9d90daf35bac7
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/52/be7e6c760b5ea885c3a5bb6896094eee33d4bf
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/53/e30938e49c5fcea36d7d6f5957e4e57983ddd4
View file
Open in desktop
@@ -0,0 +1,2 @@
x��K!D]s
.�ih��1n��h�&3 �0�/&^�]�R��r�uR#Fg��8U4:�t�.D ���H)@��,��ΏYLޥ��ȑ MP�I�eO���>*���ں�-oꋼ����!�<ݯ��-���2N�ՋT��y�����<:�o������ '�J�
Expand Down
4 changes: 4 additions & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/5a/72e1a3f30b8293837a0a484b73cdb38b837af6
View file
Open in desktop
@@ -0,0 +1,4 @@
x��K!D]s
.��f�%Ƹ�^���, �����U^�^*�Z�!������*�
PlfZl�޸T�K1G��K��xa�}�;����ȅ�*z!&7K�
��Q[�k��?س|��m�W����uK���Kj�&�qڄ��Y9�Ĥ���?��1� �L%
1 change: 1 addition & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/60/56409e3075f145072e623491007723326df3b9
View file
Open in desktop
@@ -0,0 +1 @@
x��A�!E��^ A��Ta6�A.Pe�t��v�돁\ ����s��9�8�.��c �9�a/��@�cB�X.�E]�9䀜�� I�DG�؅��r�\�!$띢߱�����U?�V���L�n?��{;Z���M[@ 1��AcԤ��o)��(w���BLB
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/64/ece5070b562d0b20c9b7ba4332df55399f1079
View file
Open in desktop
Binary file not shown.
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/7a/4f33a5a020363a9030c7de4d332e8fcfa27247
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/7f/61f236162fc68920b04208e3a93a80c774d754
View file
Open in desktop
Binary file not shown.
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/19fd77de5995e6e502e7c3b82657248f510325
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/892154edc67fd70272f3aec4c343d3c0288781
View file
Open in desktop
Binary file not shown.
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/8e/efb6f8061e4d10a7a59aac8771dc17958d93eb
View file
Open in desktop
Binary file not shown.
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/91/07b30fe11ff310fec93876469147b263fb958c
View file
Open in desktop
Binary file not shown.
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/91/116bad97c50a2daa278ca6cffe16d0118befe5
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/92/0826a357cfa0867f8598e05038136c9d1a1f5e
View file
Open in desktop
@@ -0,0 +1,3 @@
x5��
! D{�+�K������)�R��uW�2�fBՀ׾?��@���J��΍N�+ ?���]��b�)o��
���}��H����\�z���h_�����B9'v�nЌx�x;p[���?��;H
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/94/8612c82be4f24da6d4086eff5b95f85ee03454
View file
Open in desktop
Binary file not shown.
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/94/b4978fe4a6275e29f2cec6aed1d779959e1a11
View file
Open in desktop
Binary file not shown.
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/9b/2f98b1c086d3929eac387d39fae94425e0115f
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/9d/c12deeb6c9ed1746b788e3442df3e38e5deeae
View file
Open in desktop
@@ -0,0 +1,3 @@
x=�A
�0 {�+�� �~Gvd,��"+���
���9��*w�؟�Û,T錷��0�4��Lxclq�֖��,� �ȃ9��m]�B���R5��Q�[���*ܪ����C�$�l��Ϭ�80��ڥx�>�A
Expand Down
3 changes: 3 additions & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/a1/531c7e02a3aa4938858d6840a8b4859b188525
View file
Open in desktop
@@ -0,0 +1,3 @@
x5�Q
�0 �}��7�؅��!�.����Q�#�!��^�>_��2�DoQEe�C �� ���d[G:'�l����1~��M?�� �y��c~M
7U��!-�
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/a5/50125d85043b9633bf8d405363a22d3533754b
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/a5/ee1d6ce79f152f885955461611b0a16968a367
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/a9/dc97dfea4b6f215a51f2f61dba4b820cbaa599
View file
Open in desktop
@@ -0,0 +1,2 @@
x%��
1 D=�+ƛ���<����o������Ŀ��>�K� q);�/��u���A� ��r�����ڛ�i��fnƓ�]�Z��#r�~��=�VhqA�G�T�4qI�e(hl��/�W�M�є�|`�c�l!���W��H?#�=
2 changes: 2 additions & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/b6/07afb8beef6d80d8007c76f8600f3287d4b84c
View file
Open in desktop
@@ -0,0 +1,2 @@
xM�A
! Ю=�gֳ�=NF#� �i�����$��d=p>n���-9�`�d�%�߮q���IŦW�L��5�'YZ� 1r�К?3�3b�2R��Ֆ>!K,�rnXg�p��y�1���0��YU害c�� �;_��F�
2 changes: 2 additions & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/c3/6b153fea52530b41949987577542eec6312282
View file
Open in desktop
@@ -0,0 +1,2 @@
x��A� E]s
.��J��7�� �]P �x}������<���][�So)i�@9"����D!C�l4@^�3�zsK[�W�m2���z$�x�)�(1 ��d��ӗ��3~�E�Zj��oi�c=�*��5���r��A�P���AGhO(T�}��5K�
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/c6/d387ccd2bcd218be73e2265b61298efc87f27f
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/cb/2c73d23a40b594ce2b7b5cc9dc7088f0981780
View file
Open in desktop
Binary file not shown.
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/cf/08fd3081cc406fe8bd0a0b8eb2d1089c9618d6
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/d2/382450356091354a1814b1d353c09383bb9421
View file
Open in desktop
@@ -0,0 +1,2 @@
x=�1O1 ���+�.,�H� U��va�X���X��U���$D�7�ϟ߳�-l��$P�o�,�OA��e�1�'E V|�e�̽��FBwO�=���o�:S|湺��tzI@�(�^��8�����p?���cxߝG}��(���[��8���aY��Z�v���y���q򑜬a�_W�)eb��v暌:mI��6��¶�
�BBw� �p8��Q�lr
Binary file removed ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/d4/c107581ff54a41fd496e0a1f1b7b3354752103
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/de/789ec44c23aaff846394af42989f68cf839201
View file
Open in desktop
@@ -0,0 +1,2 @@
x��K� @]s
.�Jb�o��|�.�����3�{y�����uh�p��D`,���=�\���#[���Y���mh���� 8_\"_-�\-�!�l90(~�E�~������]6}-��ѽ���.u\������&����a��Q�H�*���<H�
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/e3/36969f00259aa751696f13532f6f13e608163e
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/e8/f3bf056a12d2efa65f0a46f444e5eadb827913
View file
Open in desktop
@@ -0,0 +1 @@
x=��! �a�<�d/ވ^|���� KT�o��3_�T-���]\tࣵ"1E+Å��untpڰ٫�nzO�$�����}�Z�N��`�nǩ���W}�\X�TV��*C�:�Y�3N��%�~��8�
Expand Down
Binary file added ...p.Tests/Resources/mergedrepo_wd/dot_git/objects/f5/368e572a1034743cbb728451dce4633a834781
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/branch
View file
Open in desktop
@@ -1 +1 @@
8eefb6f8061e4d10a7a59aac8771dc17958d93eb 1a5284b70c1b2a405ff99172b20c9d41cf56227a
2 changes: 1 addition & 1 deletion LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/master
View file
Open in desktop
@@ -1 +1 @@
9b2f98b1c086d3929eac387d39fae94425e0115f 1fb39db5a5c17e76627c8af5dda3e0143c9d3425