changeset 66:a061dce264b7

moved the .git files to help git users. will fix the tests a bit later
author Scott Chacon <schacon@gmail.com>
date Thu, 30 Apr 2009 12:41:44 -0700
parents 5ed8316d3cfa
children 759ac56497e7 d28d3763eda3
files dulwich/tests/data/repos/a/.git/HEAD dulwich/tests/data/repos/a/.git/index dulwich/tests/data/repos/a/.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 dulwich/tests/data/repos/a/.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec dulwich/tests/data/repos/a/.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 dulwich/tests/data/repos/a/.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364 dulwich/tests/data/repos/a/.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005 dulwich/tests/data/repos/a/.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 dulwich/tests/data/repos/a/.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f dulwich/tests/data/repos/a/.git/refs/heads/master dulwich/tests/data/repos/a/dotgit/HEAD dulwich/tests/data/repos/a/dotgit/index dulwich/tests/data/repos/a/dotgit/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 dulwich/tests/data/repos/a/dotgit/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec dulwich/tests/data/repos/a/dotgit/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 dulwich/tests/data/repos/a/dotgit/objects/7d/9a07d797595ef11344549b8d08198e48c15364 dulwich/tests/data/repos/a/dotgit/objects/a2/96d0bb611188cabb256919f36bc30117cca005 dulwich/tests/data/repos/a/dotgit/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 dulwich/tests/data/repos/a/dotgit/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f dulwich/tests/data/repos/a/dotgit/refs/heads/master dulwich/tests/data/repos/ooo_merge/.git/HEAD dulwich/tests/data/repos/ooo_merge/.git/index dulwich/tests/data/repos/ooo_merge/.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b dulwich/tests/data/repos/ooo_merge/.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520 dulwich/tests/data/repos/ooo_merge/.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 dulwich/tests/data/repos/ooo_merge/.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 dulwich/tests/data/repos/ooo_merge/.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 dulwich/tests/data/repos/ooo_merge/.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 dulwich/tests/data/repos/ooo_merge/.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 dulwich/tests/data/repos/ooo_merge/.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa dulwich/tests/data/repos/ooo_merge/.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614 dulwich/tests/data/repos/ooo_merge/.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c dulwich/tests/data/repos/ooo_merge/.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 dulwich/tests/data/repos/ooo_merge/.git/refs/heads/master dulwich/tests/data/repos/ooo_merge/dotgit/HEAD dulwich/tests/data/repos/ooo_merge/dotgit/index dulwich/tests/data/repos/ooo_merge/dotgit/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b dulwich/tests/data/repos/ooo_merge/dotgit/objects/38/74e9c60a6d149c44c928140f250d81e6381520 dulwich/tests/data/repos/ooo_merge/dotgit/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 dulwich/tests/data/repos/ooo_merge/dotgit/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 dulwich/tests/data/repos/ooo_merge/dotgit/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1 dulwich/tests/data/repos/ooo_merge/dotgit/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 dulwich/tests/data/repos/ooo_merge/dotgit/objects/95/4a536f7819d40e6f637f849ee187dd10066349 dulwich/tests/data/repos/ooo_merge/dotgit/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa dulwich/tests/data/repos/ooo_merge/dotgit/objects/f5/07291b64138b875c28e03469025b1ea20bc614 dulwich/tests/data/repos/ooo_merge/dotgit/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c dulwich/tests/data/repos/ooo_merge/dotgit/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 dulwich/tests/data/repos/ooo_merge/dotgit/refs/heads/master dulwich/tests/data/repos/simple_merge/.git/HEAD dulwich/tests/data/repos/simple_merge/.git/index dulwich/tests/data/repos/simple_merge/.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 dulwich/tests/data/repos/simple_merge/.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 dulwich/tests/data/repos/simple_merge/.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b dulwich/tests/data/repos/simple_merge/.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 dulwich/tests/data/repos/simple_merge/.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc dulwich/tests/data/repos/simple_merge/.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e dulwich/tests/data/repos/simple_merge/.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 dulwich/tests/data/repos/simple_merge/.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 dulwich/tests/data/repos/simple_merge/.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 dulwich/tests/data/repos/simple_merge/.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 dulwich/tests/data/repos/simple_merge/.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd dulwich/tests/data/repos/simple_merge/.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 dulwich/tests/data/repos/simple_merge/.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 dulwich/tests/data/repos/simple_merge/.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 dulwich/tests/data/repos/simple_merge/.git/refs/heads/master dulwich/tests/data/repos/simple_merge/dotgit/HEAD dulwich/tests/data/repos/simple_merge/dotgit/index dulwich/tests/data/repos/simple_merge/dotgit/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310 dulwich/tests/data/repos/simple_merge/dotgit/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 dulwich/tests/data/repos/simple_merge/dotgit/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b dulwich/tests/data/repos/simple_merge/dotgit/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6 dulwich/tests/data/repos/simple_merge/dotgit/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc dulwich/tests/data/repos/simple_merge/dotgit/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e dulwich/tests/data/repos/simple_merge/dotgit/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 dulwich/tests/data/repos/simple_merge/dotgit/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 dulwich/tests/data/repos/simple_merge/dotgit/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 dulwich/tests/data/repos/simple_merge/dotgit/objects/95/4a536f7819d40e6f637f849ee187dd10066349 dulwich/tests/data/repos/simple_merge/dotgit/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd dulwich/tests/data/repos/simple_merge/dotgit/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 dulwich/tests/data/repos/simple_merge/dotgit/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 dulwich/tests/data/repos/simple_merge/dotgit/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 dulwich/tests/data/repos/simple_merge/dotgit/refs/heads/master
diffstat 82 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/dulwich/tests/data/repos/a/.git/HEAD	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-ref: refs/heads/master
Binary file dulwich/tests/data/repos/a/.git/index has changed
Binary file dulwich/tests/data/repos/a/.git/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 has changed
Binary file dulwich/tests/data/repos/a/.git/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec has changed
Binary file dulwich/tests/data/repos/a/.git/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 has changed
Binary file dulwich/tests/data/repos/a/.git/objects/7d/9a07d797595ef11344549b8d08198e48c15364 has changed
Binary file dulwich/tests/data/repos/a/.git/objects/a2/96d0bb611188cabb256919f36bc30117cca005 has changed
Binary file dulwich/tests/data/repos/a/.git/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 has changed
Binary file dulwich/tests/data/repos/a/.git/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f has changed
--- a/dulwich/tests/data/repos/a/.git/refs/heads/master	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-a90fa2d900a17e99b433217e988c4eb4a2e9a097
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/a/dotgit/HEAD	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,1 @@
+ref: refs/heads/master
Binary file dulwich/tests/data/repos/a/dotgit/index has changed
Binary file dulwich/tests/data/repos/a/dotgit/objects/2a/72d929692c41d8554c07f6301757ba18a65d91 has changed
Binary file dulwich/tests/data/repos/a/dotgit/objects/4e/f30bbfe26431a69c3820d3a683df54d688f2ec has changed
Binary file dulwich/tests/data/repos/a/dotgit/objects/4f/2e6529203aa6d44b5af6e3292c837ceda003f9 has changed
Binary file dulwich/tests/data/repos/a/dotgit/objects/7d/9a07d797595ef11344549b8d08198e48c15364 has changed
Binary file dulwich/tests/data/repos/a/dotgit/objects/a2/96d0bb611188cabb256919f36bc30117cca005 has changed
Binary file dulwich/tests/data/repos/a/dotgit/objects/a9/0fa2d900a17e99b433217e988c4eb4a2e9a097 has changed
Binary file dulwich/tests/data/repos/a/dotgit/objects/ff/d47d45845a8f6576491e1edb97e3fe6a850e7f has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/a/dotgit/refs/heads/master	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,1 @@
+a90fa2d900a17e99b433217e988c4eb4a2e9a097
--- a/dulwich/tests/data/repos/ooo_merge/.git/HEAD	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-ref: refs/heads/master
Binary file dulwich/tests/data/repos/ooo_merge/.git/index has changed
Binary file dulwich/tests/data/repos/ooo_merge/.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b has changed
Binary file dulwich/tests/data/repos/ooo_merge/.git/objects/38/74e9c60a6d149c44c928140f250d81e6381520 has changed
Binary file dulwich/tests/data/repos/ooo_merge/.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 has changed
Binary file dulwich/tests/data/repos/ooo_merge/.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 has changed
--- a/dulwich/tests/data/repos/ooo_merge/.git/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-xAj1E)L%[PJօ46CftxӲzL
`MH*[dL:^l8++Pb+46nhb&ei?:檵SH@mD
-r_-ᗮxMY_~{aU*Z{<Fx0<w_LY
\ No newline at end of file
Binary file dulwich/tests/data/repos/ooo_merge/.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 has changed
Binary file dulwich/tests/data/repos/ooo_merge/.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 has changed
Binary file dulwich/tests/data/repos/ooo_merge/.git/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa has changed
Binary file dulwich/tests/data/repos/ooo_merge/.git/objects/f5/07291b64138b875c28e03469025b1ea20bc614 has changed
--- a/dulwich/tests/data/repos/ooo_merge/.git/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-x
-0ay$Yb6)=7qB)>2
CW%>rT&I@$P5iX莥7y w:^o_|Q[IZSsVIEy?
\ No newline at end of file
Binary file dulwich/tests/data/repos/ooo_merge/.git/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 has changed
--- a/dulwich/tests/data/repos/ooo_merge/.git/refs/heads/master	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-7601d7f6231db6a57f7bbb79ee52e4d462fd44d1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/ooo_merge/dotgit/HEAD	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,1 @@
+ref: refs/heads/master
Binary file dulwich/tests/data/repos/ooo_merge/dotgit/index has changed
Binary file dulwich/tests/data/repos/ooo_merge/dotgit/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b has changed
Binary file dulwich/tests/data/repos/ooo_merge/dotgit/objects/38/74e9c60a6d149c44c928140f250d81e6381520 has changed
Binary file dulwich/tests/data/repos/ooo_merge/dotgit/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 has changed
Binary file dulwich/tests/data/repos/ooo_merge/dotgit/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/ooo_merge/dotgit/objects/76/01d7f6231db6a57f7bbb79ee52e4d462fd44d1	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,2 @@
+xAj1E)L%[PJօ46CftxӲzL
`MH*[dL:^l8++Pb+46nhb&ei?:檵SH@mD
+r_-ᗮxMY_~{aU*Z{<Fx0<w_LY
\ No newline at end of file
Binary file dulwich/tests/data/repos/ooo_merge/dotgit/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 has changed
Binary file dulwich/tests/data/repos/ooo_merge/dotgit/objects/95/4a536f7819d40e6f637f849ee187dd10066349 has changed
Binary file dulwich/tests/data/repos/ooo_merge/dotgit/objects/b2/a2766a2879c209ab1176e7e778b81ae422eeaa has changed
Binary file dulwich/tests/data/repos/ooo_merge/dotgit/objects/f5/07291b64138b875c28e03469025b1ea20bc614 has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/ooo_merge/dotgit/objects/f9/e39b120c68182a4ba35349f832d0e4e61f485c	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,2 @@
+x
+0ay$Yb6)=7qB)>2
CW%>rT&I@$P5iX莥7y w:^o_|Q[IZSsVIEy?
\ No newline at end of file
Binary file dulwich/tests/data/repos/ooo_merge/dotgit/objects/fb/5b0425c7ce46959bec94d54b9a157645e114f5 has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/ooo_merge/dotgit/refs/heads/master	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,1 @@
+7601d7f6231db6a57f7bbb79ee52e4d462fd44d1
--- a/dulwich/tests/data/repos/simple_merge/.git/HEAD	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-ref: refs/heads/master
Binary file dulwich/tests/data/repos/simple_merge/.git/index has changed
--- a/dulwich/tests/data/repos/simple_merge/.git/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-xK
-@])z53׮==-&e=i:"Z=H)r芔>4wYԯMx|q=s)&6Dh6{Ym/LXg?
\ No newline at end of file
Binary file dulwich/tests/data/repos/simple_merge/.git/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 has changed
Binary file dulwich/tests/data/repos/simple_merge/.git/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b has changed
--- a/dulwich/tests/data/repos/simple_merge/.git/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-xK
-1D]L~=pݝŒ2Fo-U:.UUAI!KU.!kj
FN
*R{QofwSQ[!)G;]g8Шw863Mˇ/_m1 tSK0]i*'pCO
\ No newline at end of file
Binary file dulwich/tests/data/repos/simple_merge/.git/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc has changed
--- a/dulwich/tests/data/repos/simple_merge/.git/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-x
-0E]+f/N"]g	*5"O.υɗia	UBERr[P\ʋ
Tz靖-zN0Q
)ZOEv,pIop['lǺ<|fֶk)PGX{&K0?yMQ
\ No newline at end of file
Binary file dulwich/tests/data/repos/simple_merge/.git/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 has changed
Binary file dulwich/tests/data/repos/simple_merge/.git/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 has changed
Binary file dulwich/tests/data/repos/simple_merge/.git/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 has changed
Binary file dulwich/tests/data/repos/simple_merge/.git/objects/95/4a536f7819d40e6f637f849ee187dd10066349 has changed
--- a/dulwich/tests/data/repos/simple_merge/.git/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-xM
-0]$cL";/:3bmo|6=~SgU@c̍bUA)ƙ{ulR+ld&z7ږm{IiKt.pmQx?|ݨ!־c仴?s9r4/mO+
\ No newline at end of file
Binary file dulwich/tests/data/repos/simple_merge/.git/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 has changed
Binary file dulwich/tests/data/repos/simple_merge/.git/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 has changed
Binary file dulwich/tests/data/repos/simple_merge/.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 has changed
--- a/dulwich/tests/data/repos/simple_merge/.git/refs/heads/master	Wed Apr 29 16:18:37 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-5dac377bdded4c9aeb8dff595f0faeebcc8498cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/simple_merge/dotgit/HEAD	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,1 @@
+ref: refs/heads/master
Binary file dulwich/tests/data/repos/simple_merge/dotgit/index has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/simple_merge/dotgit/objects/0d/89f20333fbb1d2f3a94da77f4981373d8f4310	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,2 @@
+xK
+@])z53׮==-&e=i:"Z=H)r芔>4wYԯMx|q=s)&6Dh6{Ym/LXg?
\ No newline at end of file
Binary file dulwich/tests/data/repos/simple_merge/dotgit/objects/1b/6318f651a534b38f9c7aedeebbd56c1e896853 has changed
Binary file dulwich/tests/data/repos/simple_merge/dotgit/objects/29/69be3e8ee1c0222396a5611407e4769f14e54b has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/simple_merge/dotgit/objects/4c/ffe90e0a41ad3f5190079d7c8f036bde29cbe6	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,2 @@
+xK
+1D]L~=pݝŒ2Fo-U:.UUAI!KU.!kj
FN
*R{QofwSQ[!)G;]g8Шw863Mˇ/_m1 tSK0]i*'pCO
\ No newline at end of file
Binary file dulwich/tests/data/repos/simple_merge/dotgit/objects/5d/ac377bdded4c9aeb8dff595f0faeebcc8498cc has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/simple_merge/dotgit/objects/60/dacdc733de308bb77bb76ce0fb0f9b44c9769e	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,2 @@
+x
+0E]+f/N"]g	*5"O.υɗia	UBERr[P\ʋ
Tz靖-zN0Q
)ZOEv,pIop['lǺ<|fֶk)PGX{&K0?yMQ
\ No newline at end of file
Binary file dulwich/tests/data/repos/simple_merge/dotgit/objects/6f/670c0fb53f9463760b7295fbb814e965fb20c8 has changed
Binary file dulwich/tests/data/repos/simple_merge/dotgit/objects/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6 has changed
Binary file dulwich/tests/data/repos/simple_merge/dotgit/objects/90/182552c4a85a45ec2a835cadc3451bebdfe870 has changed
Binary file dulwich/tests/data/repos/simple_merge/dotgit/objects/95/4a536f7819d40e6f637f849ee187dd10066349 has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/simple_merge/dotgit/objects/ab/64bbdcc51b170d21588e5c5d391ee5c0c96dfd	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,2 @@
+xM
+0]$cL";/:3bmo|6=~SgU@c̍bUA)ƙ{ulR+ld&z7ږm{IiKt.pmQx?|ݨ!־c仴?s9r4/mO+
\ No newline at end of file
Binary file dulwich/tests/data/repos/simple_merge/dotgit/objects/d4/bdad6549dfedf25d3b89d21f506aff575b28a7 has changed
Binary file dulwich/tests/data/repos/simple_merge/dotgit/objects/d8/0c186a03f423a81b39df39dc87fd269736ca86 has changed
Binary file dulwich/tests/data/repos/simple_merge/dotgit/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dulwich/tests/data/repos/simple_merge/dotgit/refs/heads/master	Thu Apr 30 12:41:44 2009 -0700
@@ -0,0 +1,1 @@
+5dac377bdded4c9aeb8dff595f0faeebcc8498cc