diff options
| author | Vicent Marti <tanoku@gmail.com> | 2013-11-20 12:54:24 +0100 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2013-11-20 12:54:24 +0100 |
| commit | 4b0a36e881506a02b43a4ae3c19c93c919b36eeb (patch) | |
| tree | 026182fa30273a4c1649928b6db3fc5335bd1ea4 /tests/resources/merge-resolve/.gitted/objects/d6 | |
| parent | 29d7242b1dcd1f09a63417abd648a6217b85d301 (diff) | |
| parent | 43cb8b32428b1b29994874349ec22eb5372e152c (diff) | |
| download | libgit2-4b0a36e881506a02b43a4ae3c19c93c919b36eeb.tar.gz | |
Merge branch 'development'
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/objects/d6')
3 files changed, 2 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/objects/d6/42b9770c66bba94a08df09b5efb095001f76d7 b/tests/resources/merge-resolve/.gitted/objects/d6/42b9770c66bba94a08df09b5efb095001f76d7 Binary files differnew file mode 100644 index 000000000..1671f9f2c --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/objects/d6/42b9770c66bba94a08df09b5efb095001f76d7 diff --git a/tests/resources/merge-resolve/.gitted/objects/d6/462fa3f5292857db599c54aea2bf91616230c5 b/tests/resources/merge-resolve/.gitted/objects/d6/462fa3f5292857db599c54aea2bf91616230c5 Binary files differnew file mode 100644 index 000000000..baae3f0e0 --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/objects/d6/462fa3f5292857db599c54aea2bf91616230c5 diff --git a/tests/resources/merge-resolve/.gitted/objects/d6/cf6c7741b3316826af1314042550c97ded1d50 b/tests/resources/merge-resolve/.gitted/objects/d6/cf6c7741b3316826af1314042550c97ded1d50 new file mode 100644 index 000000000..8f9ae1fc6 --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/objects/d6/cf6c7741b3316826af1314042550c97ded1d50 @@ -0,0 +1,2 @@ +xQ +1 D)r%i@ oje[7 ̤ZʽMSLBNlm B~>-uY8ꠟt֯]Qa͠3f]>bl(A]
\ No newline at end of file |