summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-recursive/.gitted/objects/a2
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-recursive/.gitted/objects/a2')
-rw-r--r--tests/resources/merge-recursive/.gitted/objects/a2/817ed0e8ca6fe52bf0a20b2f50eb94b9ea5415bin0 -> 153 bytes
-rw-r--r--tests/resources/merge-recursive/.gitted/objects/a2/8c21c90aa36580641b345011869d1a899a67832
-rw-r--r--tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f03
3 files changed, 5 insertions, 0 deletions
diff --git a/tests/resources/merge-recursive/.gitted/objects/a2/817ed0e8ca6fe52bf0a20b2f50eb94b9ea5415 b/tests/resources/merge-recursive/.gitted/objects/a2/817ed0e8ca6fe52bf0a20b2f50eb94b9ea5415
new file mode 100644
index 0000000..a043a8e
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/a2/817ed0e8ca6fe52bf0a20b2f50eb94b9ea5415
Binary files differ
diff --git a/tests/resources/merge-recursive/.gitted/objects/a2/8c21c90aa36580641b345011869d1a899a6783 b/tests/resources/merge-recursive/.gitted/objects/a2/8c21c90aa36580641b345011869d1a899a6783
new file mode 100644
index 0000000..91ffb4b
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/a2/8c21c90aa36580641b345011869d1a899a6783
@@ -0,0 +1,2 @@
+xN@ ۥ:\I x^dQ WDg3i\<7le*MbB0 Ji%XTUV[6CԠՔQR0ZjB/TD OmDr% bxR>
+jra,hWwY=wo;[nk1'D1Ó/~xmrrmѝROa \ No newline at end of file
diff --git a/tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f0 b/tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f0
new file mode 100644
index 0000000..3471394
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/a2/fa36ffc4a565a223e225d15b18774f87d0c4f0
@@ -0,0 +1,3 @@
+xA D]s
+.Cb c]LfRG¡P9Ѣ%@ k0L bӡ/W^ĄT倾 yIY
+*u"Dd("m+Yަ:ougG] ~|@)>5brx7Q \ No newline at end of file