summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996')
-rw-r--r--tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996bin0 -> 32 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996 b/tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996
new file mode 100644
index 000000000..bc9a32ebc
--- /dev/null
+++ b/tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996
Binary files differ