summaryrefslogtreecommitdiff
path: root/tests/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19')
-rw-r--r--tests/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d193
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19 b/tests/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19
new file mode 100644
index 000000000..cb4d34e77
--- /dev/null
+++ b/tests/resources/twowaymerge.git/objects/a4/1a49f8f5cd9b6cb14a076bf8394881ed0b4d19
@@ -0,0 +1,3 @@
+xν 0@ajOq 7'!DD A$FٟW<=<5Z
+8N(CzDž$'2!>[):#Dzǵ, z M d=tNŭ=
+wk}9.p9^Ʃ=I@Y =ulD \ No newline at end of file