summaryrefslogtreecommitdiffstats
path: root/tests/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83')
-rw-r--r--tests/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb833
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83 b/tests/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83
new file mode 100644
index 0000000..48466ea
--- /dev/null
+++ b/tests/resources/twowaymerge.git/objects/22/24e191514cb4bd8c566d80dac22dfcb1e9bb83
@@ -0,0 +1,3 @@
+xK
+0@]sK& z4HMobY1t[JblɈ4vɡL '՛V`B .
+Im 1ZǠxcKh^^+\>?2a.M,tTBp^kucjV_sFh \ No newline at end of file