summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/.gitted/objects/29
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/objects/29')
-rw-r--r--tests/resources/merge-resolve/.gitted/objects/29bin0 -> 75 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/objects/29 b/tests/resources/merge-resolve/.gitted/objects/29
new file mode 100644
index 0000000..9661507
--- /dev/null
+++ b/tests/resources/merge-resolve/.gitted/objects/29
Binary files differ