summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-recursive/.gitted/objects/37
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-recursive/.gitted/objects/37')
-rw-r--r--tests/resources/merge-recursive/.gitted/objects/37/185b25a204309bf74817da1a607518f13ca3edbin0 -> 715 bytes
-rw-r--r--tests/resources/merge-recursive/.gitted/objects/37/a5054a9f9b4628e3924c5cb8f2147c6e2a3efcbin0 -> 630 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/resources/merge-recursive/.gitted/objects/37/185b25a204309bf74817da1a607518f13ca3ed b/tests/resources/merge-recursive/.gitted/objects/37/185b25a204309bf74817da1a607518f13ca3ed
new file mode 100644
index 0000000..a8cf005
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/37/185b25a204309bf74817da1a607518f13ca3ed
Binary files differ
diff --git a/tests/resources/merge-recursive/.gitted/objects/37/a5054a9f9b4628e3924c5cb8f2147c6e2a3efc b/tests/resources/merge-recursive/.gitted/objects/37/a5054a9f9b4628e3924c5cb8f2147c6e2a3efc
new file mode 100644
index 0000000..4591f0e
--- /dev/null
+++ b/tests/resources/merge-recursive/.gitted/objects/37/a5054a9f9b4628e3924c5cb8f2147c6e2a3efc
Binary files differ