summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve.git/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/merge-resolve.git/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f')
-rw-r--r--tests/resources/merge-resolve.git/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve.git/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f b/tests/resources/merge-resolve.git/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f
new file mode 100644
index 000000000..9a0cb7a0c
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f
@@ -0,0 +1,2 @@
+x]
+0})&_H -Fb[6}0L2wPzc*sXb Rt#G$[lvH$kf.ʧLF+ QHD|68Wl.S]uoNOu9Va0^ZF9^# Od \ No newline at end of file