Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Tests for case sensitive conflicts in the index #345

Open
wants to merge 1 commit into from

5 participants

@ethomson
Owner

So after looking at #344 , I wanted to add a test case that had conflicts in the index that differed only in case.

core git will allow a merge of two branches that contain items differ in case, regardless of your platform or your core.ignorecase settings and we should, I would think, be able to handle those conflicts.

My thought was that these tests would simply pass against the current code base, but to my surprise, they do not...! I have not yet been able to debug this, but it appears that ignorecase is a deeper setting than I had imagined.

I did want to push up this test, though, to illustrate a problem that can arise and start some discussion.

/cc @nulltoken
/cc @dahlbyk

@dahlbyk
Collaborator

Thanks for this - there's definitely something off here. I've extended your tests here: https://github.com/dahlbyk/libgit2sharp/compare/gh345

  • With ignorecase = false, everything work as expected.
  • With ignorecase = true, I get inconsistent results:
    • Lookup by path returns matching a/o/t regardless of case, equivalent to a/o/t for Differs-In-Case.txt.
    • Enumerating the index yields an identical result to ignorecase = false, but I have to proactively sort Index case-sensitively to get the groups of entries to line up.
@ethomson
Owner

Yeah, that's what I was seeing, too. I should have written tests for this earlier, because this seems like madness, but I thought I knew how it worked.

@dahlbyk dahlbyk referenced this pull request
Closed

Ignore Case via Repository.PathComparer #344

2 of 3 tasks complete
@nulltoken
Owner

@ethomson Here's a failing libgit2 test reproducing the issue

void test_index_conflicts__case_matters(void)
{
    git_index_entry *conflict_entry[3];
    git_oid oid;
    char *upper_case = "DIFFERS-IN-CASE.TXT";
    char *mixed_case = "Differs-In-Case.txt";

    git_index_entry ancestor_entry, our_entry, their_entry;

    memset(&ancestor_entry, 0x0, sizeof(git_index_entry));
    memset(&our_entry, 0x0, sizeof(git_index_entry));
    memset(&their_entry, 0x0, sizeof(git_index_entry));

    ancestor_entry.path = upper_case;
    ancestor_entry.flags |= (1 << GIT_IDXENTRY_STAGESHIFT);
    git_oid_fromstr(&ancestor_entry.oid, CONFLICTS_ONE_ANCESTOR_OID);

    our_entry.path = upper_case;
    ancestor_entry.flags |= (2 << GIT_IDXENTRY_STAGESHIFT);
    git_oid_fromstr(&our_entry.oid, CONFLICTS_ONE_OUR_OID);

    their_entry.path = upper_case;
    ancestor_entry.flags |= (3 << GIT_IDXENTRY_STAGESHIFT);
    git_oid_fromstr(&their_entry.oid, CONFLICTS_ONE_THEIR_OID);

    cl_git_pass(git_index_conflict_add(repo_index,
        &ancestor_entry, &our_entry, &their_entry));

    ancestor_entry.path = mixed_case;
    ancestor_entry.flags |= (1 << GIT_IDXENTRY_STAGESHIFT);
    git_oid_fromstr(&ancestor_entry.oid, CONFLICTS_TWO_ANCESTOR_OID);

    our_entry.path = mixed_case;
    ancestor_entry.flags |= (2 << GIT_IDXENTRY_STAGESHIFT);
    git_oid_fromstr(&our_entry.oid, CONFLICTS_TWO_OUR_OID);

    their_entry.path = mixed_case;
    ancestor_entry.flags |= (3 << GIT_IDXENTRY_STAGESHIFT);
    git_oid_fromstr(&their_entry.oid, CONFLICTS_TWO_THEIR_OID);

    cl_git_pass(git_index_conflict_add(repo_index,
        &ancestor_entry, &our_entry, &their_entry));

    cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1],
        &conflict_entry[2], repo_index, upper_case));

    cl_assert_equal_s(upper_case, conflict_entry[0]->path);
    cl_assert_equal_i(true,
        git_oid_streq(&conflict_entry[0]->oid, CONFLICTS_ONE_ANCESTOR_OID) == 0);

    cl_assert_equal_s(upper_case, conflict_entry[1]->path);
    cl_assert_equal_i(true,
        git_oid_streq(&conflict_entry[1]->oid, CONFLICTS_ONE_OUR_OID) == 0);

    cl_assert_equal_s(upper_case, conflict_entry[0]->path);
    cl_assert_equal_i(true,
        git_oid_streq(&conflict_entry[2]->oid, CONFLICTS_ONE_THEIR_OID) == 0);

    cl_git_pass(git_index_conflict_get(&conflict_entry[0], &conflict_entry[1],
        &conflict_entry[2], repo_index, mixed_case));

    cl_assert_equal_s(mixed_case, conflict_entry[0]->path);
    cl_assert_equal_i(true,
        git_oid_streq(&conflict_entry[0]->oid, CONFLICTS_TWO_ANCESTOR_OID) == 0);

    cl_assert_equal_s(mixed_case, conflict_entry[1]->path);
    cl_assert_equal_i(true,
        git_oid_streq(&conflict_entry[1]->oid, CONFLICTS_TWO_OUR_OID) == 0);

    cl_assert_equal_s(mixed_case, conflict_entry[0]->path);
    cl_assert_equal_i(true,
        git_oid_streq(&conflict_entry[2]->oid, CONFLICTS_TWO_THEIR_OID) == 0);
}

From what I've understood current behavior comes from index.c::250.

@arrbee
Owner

@nulltoken This is great - i.e. having a failing libgit2 test. I have come to worry about our strategy of actually storing the index internally case insensitively (since the core git index never is). I'm interested in how this pans out and in helping if I can. We may be able to use the secondary index technique that I used to add case-insensitivity to tree iterators to support efficient index use on case insensitive platforms without altering the internal representation to be incompatible with git.

@dahlbyk
Collaborator

Updated https://github.com/dahlbyk/libgit2sharp/compare/gh345

@arrbee Was a libgit2 issue ever created for this? I couldn't find one...

@nulltoken
Owner
@yorah

@dahlbyk @nulltoken @arrbee the C test is still failing (as it relies on the index capabilities, so libgit2/libgit2#1499 doesn't help here).

@nulltoken
Owner

Issue created in libgit2 -> libgit2/libgit2#2534

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 20, 2013
  1. @ethomson

    merge repo has case sensitive conflicts in its index, add tests to ha…

    ethomson authored ethomson committed
    …ndle
    
    such
This page is out of date. Refresh to see the latest.
Showing with 107 additions and 30 deletions.
  1. +2 −0  LibGit2Sharp.Tests/ConflictFixture.cs
  2. +10 −0 LibGit2Sharp.Tests/Resources/mergedrepo_wd/DIFFERS-IN-CASE.TXT
  3. +1 −1  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_HEAD
  4. +2 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_MSG
  5. +1 −1  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/ORIG_HEAD
  6. +1 −3 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/config
  7. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/index
  8. +41 −15 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD
  9. +6 −4 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch
  10. +8 −4 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master
  11. +2 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/theirs
  12. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/02/8be3f2ea84cb689b3c2f40da4023bc93faf4ba
  13. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/08/dcaefb23daaf07d96afcd42e603d328721a20c
  14. +1 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/0a/636a157ae305b03f3f4eb8c37fbfca7ab7564a
  15. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/11/c7159b2cff4b5dde07dde7a1db09a3389e16a6
  16. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/12/49d12517e2735c3aa90e3a4d3e2fd45fcbe729
  17. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/13/cec9650a916e4c56f25190374feaa7d5b2a7a0
  18. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/1a/5284b70c1b2a405ff99172b20c9d41cf56227a
  19. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/1c/b365141a52dfbb24933515820eb3045fbca12b
  20. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/1f/b39db5a5c17e76627c8af5dda3e0143c9d3425
  21. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/2b/76b92053e9efe82a0f14beb6ac7acfbb379152
  22. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/37/59e38c9b3ce50a318174970229351a039d7571
  23. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/38/1740f5bae5d776f0ab5d1bbd06f6b5f2191c7d
  24. +2 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/3e/1bdb064a067e4ef4c70f1c0e237a114212e24e
  25. +1 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/44/c8a5fb4ada4347d15b0c7bf6403f91af810b9e
  26. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/49/3209f496e504d63fd78e8c5b800083b442ea34
  27. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/4e/b4293b45001605eaaa24fd81201071bf020276
  28. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/50/72f78b82f5deb4587736cf86c9d90daf35bac7
  29. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/52/be7e6c760b5ea885c3a5bb6896094eee33d4bf
  30. +2 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/53/e30938e49c5fcea36d7d6f5957e4e57983ddd4
  31. +4 −0 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/5a/72e1a3f30b8293837a0a484b73cdb38b837af6
  32. +1 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/60/56409e3075f145072e623491007723326df3b9
  33. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/64/ece5070b562d0b20c9b7ba4332df55399f1079
  34. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/7a/4f33a5a020363a9030c7de4d332e8fcfa27247
  35. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/7f/61f236162fc68920b04208e3a93a80c774d754
  36. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/19fd77de5995e6e502e7c3b82657248f510325
  37. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/892154edc67fd70272f3aec4c343d3c0288781
  38. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8e/efb6f8061e4d10a7a59aac8771dc17958d93eb
  39. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/91/07b30fe11ff310fec93876469147b263fb958c
  40. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/91/116bad97c50a2daa278ca6cffe16d0118befe5
  41. +3 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/92/0826a357cfa0867f8598e05038136c9d1a1f5e
  42. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/94/8612c82be4f24da6d4086eff5b95f85ee03454
  43. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/94/b4978fe4a6275e29f2cec6aed1d779959e1a11
  44. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/9b/2f98b1c086d3929eac387d39fae94425e0115f
  45. +3 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/9d/c12deeb6c9ed1746b788e3442df3e38e5deeae
  46. +3 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/a1/531c7e02a3aa4938858d6840a8b4859b188525
  47. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/a5/50125d85043b9633bf8d405363a22d3533754b
  48. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/a5/ee1d6ce79f152f885955461611b0a16968a367
  49. +2 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/a9/dc97dfea4b6f215a51f2f61dba4b820cbaa599
  50. +2 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/b6/07afb8beef6d80d8007c76f8600f3287d4b84c
  51. +2 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/c3/6b153fea52530b41949987577542eec6312282
  52. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/c6/d387ccd2bcd218be73e2265b61298efc87f27f
  53. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/cb/2c73d23a40b594ce2b7b5cc9dc7088f0981780
  54. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/cf/08fd3081cc406fe8bd0a0b8eb2d1089c9618d6
  55. +2 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/d2/382450356091354a1814b1d353c09383bb9421
  56. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/d4/c107581ff54a41fd496e0a1f1b7b3354752103
  57. +2 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/de/789ec44c23aaff846394af42989f68cf839201
  58. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/e3/36969f00259aa751696f13532f6f13e608163e
  59. +1 −0  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/e8/f3bf056a12d2efa65f0a46f444e5eadb827913
  60. BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/f5/368e572a1034743cbb728451dce4633a834781
  61. +1 −1  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/branch
  62. +1 −1  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/master
View
2  LibGit2Sharp.Tests/ConflictFixture.cs
@@ -14,6 +14,8 @@ public static IEnumerable<object[]> ConflictData
{
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-theirs.txt", "3aafd4d0bac33cc3c78c4c070f3966fb6e6f641a", null, "7b26cd5ac0ee68483ae4d5e1e00b064547ea8c9b" },
new string[] { "ancestor-only.txt", "9736f4cd77759672322f3222ed3ddead1412d969", null, null },
View
10 LibGit2Sharp.Tests/Resources/mergedrepo_wd/DIFFERS-IN-CASE.TXT
@@ -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
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_HEAD
@@ -1 +1 @@
-8eefb6f8061e4d10a7a59aac8771dc17958d93eb
+1a5284b70c1b2a405ff99172b20c9d41cf56227a
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/MERGE_MSG
@@ -1,6 +1,8 @@
Merge branch 'branch'
Conflicts:
+ DIFFERS-IN-CASE.TXT
+ Differs-In-Case.txt
ancestor-and-ours.txt
ancestor-and-theirs.txt
ancestor-only.txt
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/ORIG_HEAD
@@ -1 +1 @@
-9b2f98b1c086d3929eac387d39fae94425e0115f
+1fb39db5a5c17e76627c8af5dda3e0143c9d3425
View
4 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/config
@@ -1,8 +1,6 @@
[core]
repositoryformatversion = 0
- filemode = false
+ filemode = true
bare = false
logallrefupdates = true
- symlinks = false
ignorecase = true
- hideDotFiles = dotGitOnly
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/index
Binary file not shown
View
56 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/HEAD
@@ -1,15 +1,41 @@
-0000000000000000000000000000000000000000 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632480 -0600 commit (initial): ancestor
-9107b30fe11ff310fec93876469147b263fb958c 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632483 -0600 checkout: moving from master to branch
-9107b30fe11ff310fec93876469147b263fb958c d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360632833 -0600 commit: branch
-d4c107581ff54a41fd496e0a1f1b7b3354752103 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632835 -0600 checkout: moving from branch to master
-9107b30fe11ff310fec93876469147b263fb958c 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson <ethomson@microsoft.com> 1360633224 -0600 commit: ours
-8b19fd77de5995e6e502e7c3b82657248f510325 91116bad97c50a2daa278ca6cffe16d0118befe5 Edward Thomson <ethomson@microsoft.com> 1360633337 -0600 commit: ours
-91116bad97c50a2daa278ca6cffe16d0118befe5 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson <ethomson@microsoft.com> 1360633358 -0600 checkout: moving from master to 8b19fd7
-8b19fd77de5995e6e502e7c3b82657248f510325 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 1360633359 -0600 rebase -i (squash): ours
-9b2f98b1c086d3929eac387d39fae94425e0115f 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 1360633362 -0600 rebase -i (finish): returning to refs/heads/master
-9b2f98b1c086d3929eac387d39fae94425e0115f d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360633367 -0600 checkout: moving from master to branch
-d4c107581ff54a41fd496e0a1f1b7b3354752103 493209f496e504d63fd78e8c5b800083b442ea34 Edward Thomson <ethomson@microsoft.com> 1360633416 -0600 commit: branch
-493209f496e504d63fd78e8c5b800083b442ea34 d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360633427 -0600 checkout: moving from branch to d4c1075
-d4c107581ff54a41fd496e0a1f1b7b3354752103 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson <ethomson@microsoft.com> 1360633429 -0600 rebase -i (squash): branch
-8eefb6f8061e4d10a7a59aac8771dc17958d93eb 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson <ethomson@microsoft.com> 1360633436 -0600 rebase -i (finish): returning to refs/heads/branch
-8eefb6f8061e4d10a7a59aac8771dc17958d93eb 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 1360633440 -0600 checkout: moving from branch to master
+0000000000000000000000000000000000000000 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361388250 -0600 commit (initial): initial revision
+2b76b92053e9efe82a0f14beb6ac7acfbb379152 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361388263 -0600 checkout: moving from master to theirs
+2b76b92053e9efe82a0f14beb6ac7acfbb379152 13cec9650a916e4c56f25190374feaa7d5b2a7a0 Edward Thomson <ethomson@microsoft.com> 1361388388 -0600 commit: branch
+13cec9650a916e4c56f25190374feaa7d5b2a7a0 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361388397 -0600 checkout: moving from theirs to master
+2b76b92053e9efe82a0f14beb6ac7acfbb379152 5a72e1a3f30b8293837a0a484b73cdb38b837af6 Edward Thomson <ethomson@microsoft.com> 1361389221 -0600 commit: master
+5a72e1a3f30b8293837a0a484b73cdb38b837af6 c36b153fea52530b41949987577542eec6312282 Edward Thomson <ethomson@microsoft.com> 1361389283 -0600 commit: master
+c36b153fea52530b41949987577542eec6312282 5a72e1a3f30b8293837a0a484b73cdb38b837af6 Edward Thomson <ethomson@microsoft.com> 1361389302 -0600 checkout: moving from master to 5a72e1a
+5a72e1a3f30b8293837a0a484b73cdb38b837af6 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361389302 -0600 rebase -i (squash): updating HEAD
+2b76b92053e9efe82a0f14beb6ac7acfbb379152 3e1bdb064a067e4ef4c70f1c0e237a114212e24e Edward Thomson <ethomson@microsoft.com> 1361389302 -0600 rebase -i (squash): master
+3e1bdb064a067e4ef4c70f1c0e237a114212e24e 3e1bdb064a067e4ef4c70f1c0e237a114212e24e Edward Thomson <ethomson@microsoft.com> 1361389306 -0600 rebase -i (finish): returning to refs/heads/master
+3e1bdb064a067e4ef4c70f1c0e237a114212e24e 8b892154edc67fd70272f3aec4c343d3c0288781 Edward Thomson <ethomson@microsoft.com> 1361389647 -0600 commit: foo
+8b892154edc67fd70272f3aec4c343d3c0288781 3e1bdb064a067e4ef4c70f1c0e237a114212e24e Edward Thomson <ethomson@microsoft.com> 1361389657 -0600 checkout: moving from master to 3e1bdb0
+3e1bdb064a067e4ef4c70f1c0e237a114212e24e 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361389657 -0600 rebase -i (squash): updating HEAD
+2b76b92053e9efe82a0f14beb6ac7acfbb379152 53e30938e49c5fcea36d7d6f5957e4e57983ddd4 Edward Thomson <ethomson@microsoft.com> 1361389657 -0600 rebase -i (squash): 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
View
10 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/branch
@@ -1,4 +1,6 @@
-0000000000000000000000000000000000000000 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632483 -0600 branch: Created from HEAD
-9107b30fe11ff310fec93876469147b263fb958c d4c107581ff54a41fd496e0a1f1b7b3354752103 Edward Thomson <ethomson@microsoft.com> 1360632833 -0600 commit: branch
-d4c107581ff54a41fd496e0a1f1b7b3354752103 493209f496e504d63fd78e8c5b800083b442ea34 Edward Thomson <ethomson@microsoft.com> 1360633416 -0600 commit: branch
-493209f496e504d63fd78e8c5b800083b442ea34 8eefb6f8061e4d10a7a59aac8771dc17958d93eb Edward Thomson <ethomson@microsoft.com> 1360633436 -0600 rebase -i (finish): refs/heads/branch onto d4c1075
+13cec9650a916e4c56f25190374feaa7d5b2a7a0 de789ec44c23aaff846394af42989f68cf839201 Edward Thomson <ethomson@microsoft.com> 1361389786 -0600 commit: foo
+de789ec44c23aaff846394af42989f68cf839201 f5368e572a1034743cbb728451dce4633a834781 Edward Thomson <ethomson@microsoft.com> 1361389795 -0600 rebase -i (finish): refs/heads/branch onto 13cec96
+f5368e572a1034743cbb728451dce4633a834781 1249d12517e2735c3aa90e3a4d3e2fd45fcbe729 Edward Thomson <ethomson@microsoft.com> 1361389854 -0600 commit: branch
+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
View
12 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/master
@@ -1,4 +1,8 @@
-0000000000000000000000000000000000000000 9107b30fe11ff310fec93876469147b263fb958c Edward Thomson <ethomson@microsoft.com> 1360632480 -0600 commit (initial): ancestor
-9107b30fe11ff310fec93876469147b263fb958c 8b19fd77de5995e6e502e7c3b82657248f510325 Edward Thomson <ethomson@microsoft.com> 1360633224 -0600 commit: ours
-8b19fd77de5995e6e502e7c3b82657248f510325 91116bad97c50a2daa278ca6cffe16d0118befe5 Edward Thomson <ethomson@microsoft.com> 1360633337 -0600 commit: ours
-91116bad97c50a2daa278ca6cffe16d0118befe5 9b2f98b1c086d3929eac387d39fae94425e0115f Edward Thomson <ethomson@microsoft.com> 1360633362 -0600 rebase -i (finish): refs/heads/master onto 8b19fd7
+0000000000000000000000000000000000000000 2b76b92053e9efe82a0f14beb6ac7acfbb379152 Edward Thomson <ethomson@microsoft.com> 1361388250 -0600 commit (initial): initial revision
+2b76b92053e9efe82a0f14beb6ac7acfbb379152 5a72e1a3f30b8293837a0a484b73cdb38b837af6 Edward Thomson <ethomson@microsoft.com> 1361389221 -0600 commit: master
+5a72e1a3f30b8293837a0a484b73cdb38b837af6 c36b153fea52530b41949987577542eec6312282 Edward Thomson <ethomson@microsoft.com> 1361389283 -0600 commit: master
+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
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/logs/refs/heads/theirs
@@ -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
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/02/8be3f2ea84cb689b3c2f40da4023bc93faf4ba
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/08/dcaefb23daaf07d96afcd42e603d328721a20c
Binary file not shown
View
1  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/0a/636a157ae305b03f3f4eb8c37fbfca7ab7564a
@@ -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��>��-�
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/11/c7159b2cff4b5dde07dde7a1db09a3389e16a6
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/12/49d12517e2735c3aa90e3a4d3e2fd45fcbe729
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/13/cec9650a916e4c56f25190374feaa7d5b2a7a0
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/1a/5284b70c1b2a405ff99172b20c9d41cf56227a
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/1c/b365141a52dfbb24933515820eb3045fbca12b
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/1f/b39db5a5c17e76627c8af5dda3e0143c9d3425
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/2b/76b92053e9efe82a0f14beb6ac7acfbb379152
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/37/59e38c9b3ce50a318174970229351a039d7571
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/38/1740f5bae5d776f0ab5d1bbd06f6b5f2191c7d
Binary file not shown
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/3e/1bdb064a067e4ef4c70f1c0e237a114212e24e
@@ -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
View
1  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/44/c8a5fb4ada4347d15b0c7bf6403f91af810b9e
@@ -0,0 +1 @@
+x �1�0P��i⬳G�B-�B#���^~<c?��Yj����R�S�Ӡ�B��z��+i�Un�J1�ż����
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/49/3209f496e504d63fd78e8c5b800083b442ea34
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/4e/b4293b45001605eaaa24fd81201071bf020276
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/50/72f78b82f5deb4587736cf86c9d90daf35bac7
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/52/be7e6c760b5ea885c3a5bb6896094eee33d4bf
Binary file not shown
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/53/e30938e49c5fcea36d7d6f5957e4e57983ddd4
@@ -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�
View
4 LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/5a/72e1a3f30b8293837a0a484b73cdb38b837af6
@@ -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%
View
1  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/60/56409e3075f145072e623491007723326df3b9
@@ -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
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/64/ece5070b562d0b20c9b7ba4332df55399f1079
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/7a/4f33a5a020363a9030c7de4d332e8fcfa27247
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/7f/61f236162fc68920b04208e3a93a80c774d754
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/19fd77de5995e6e502e7c3b82657248f510325
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8b/892154edc67fd70272f3aec4c343d3c0288781
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/8e/efb6f8061e4d10a7a59aac8771dc17958d93eb
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/91/07b30fe11ff310fec93876469147b263fb958c
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/91/116bad97c50a2daa278ca6cffe16d0118befe5
Binary file not shown
View
3  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/92/0826a357cfa0867f8598e05038136c9d1a1f5e
@@ -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
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/94/8612c82be4f24da6d4086eff5b95f85ee03454
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/94/b4978fe4a6275e29f2cec6aed1d779959e1a11
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/9b/2f98b1c086d3929eac387d39fae94425e0115f
Binary file not shown
View
3  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/9d/c12deeb6c9ed1746b788e3442df3e38e5deeae
@@ -0,0 +1,3 @@
+x=�A
+�0 {�+�� �~Gvd,��"+���
+���9��*w�؟�Û,T錷��0�4�Lxclq�֖��, � �ȃ9��m]�B���R5��Q�[���*ܪ����C�$�l��Ϭ�80��ڥx�>�A
View
3  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/a1/531c7e02a3aa4938858d6840a8b4859b188525
@@ -0,0 +1,3 @@
+x5�Q
+�0 �}��7�؅��!�.����Q�#�!��^�>_��2�DoQEe�C �� ���d[G:'�l����1~��M?�� �y��c~M
+7U��!-�
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/a5/50125d85043b9633bf8d405363a22d3533754b
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/a5/ee1d6ce79f152f885955461611b0a16968a367
Binary file not shown
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/a9/dc97dfea4b6f215a51f2f61dba4b820cbaa599
@@ -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?#�=
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/b6/07afb8beef6d80d8007c76f8600f3287d4b84c
@@ -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�
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/c3/6b153fea52530b41949987577542eec6312282
@@ -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�
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/c6/d387ccd2bcd218be73e2265b61298efc87f27f
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/cb/2c73d23a40b594ce2b7b5cc9dc7088f0981780
Binary file not shown
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/cf/08fd3081cc406fe8bd0a0b8eb2d1089c9618d6
Binary file not shown
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/d2/382450356091354a1814b1d353c09383bb9421
@@ -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
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/d4/c107581ff54a41fd496e0a1f1b7b3354752103
Binary file not shown
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/de/789ec44c23aaff846394af42989f68cf839201
@@ -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�
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/e3/36969f00259aa751696f13532f6f13e608163e
Binary file not shown
View
1  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/e8/f3bf056a12d2efa65f0a46f444e5eadb827913
@@ -0,0 +1 @@
+x=��! �a�<�d/ވ^|���� K T�o��3_�T-���]\tࣵ"1E+Å�untpڰ٫� nzO�$�����}�Z�N��`�nǩ���W}�\X�TV��*C�:�Y�3N��%�~��8�
View
BIN  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/objects/f5/368e572a1034743cbb728451dce4633a834781
Binary file not shown
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/branch
@@ -1 +1 @@
-8eefb6f8061e4d10a7a59aac8771dc17958d93eb
+1a5284b70c1b2a405ff99172b20c9d41cf56227a
View
2  LibGit2Sharp.Tests/Resources/mergedrepo_wd/dot_git/refs/heads/master
@@ -1 +1 @@
-9b2f98b1c086d3929eac387d39fae94425e0115f
+1fb39db5a5c17e76627c8af5dda3e0143c9d3425
Something went wrong with that request. Please try again.