summaryrefslogtreecommitdiff
path: root/tests/resources/twowaymerge.git/objects/42/b7311aa626e712891940c1ec5d5cba201946a4
diff options
context:
space:
mode:
Diffstat (limited to 'tests/resources/twowaymerge.git/objects/42/b7311aa626e712891940c1ec5d5cba201946a4')
-rw-r--r--tests/resources/twowaymerge.git/objects/42/b7311aa626e712891940c1ec5d5cba201946a43
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/resources/twowaymerge.git/objects/42/b7311aa626e712891940c1ec5d5cba201946a4 b/tests/resources/twowaymerge.git/objects/42/b7311aa626e712891940c1ec5d5cba201946a4
new file mode 100644
index 000000000..a8e6581f8
--- /dev/null
+++ b/tests/resources/twowaymerge.git/objects/42/b7311aa626e712891940c1ec5d5cba201946a4
@@ -0,0 +1,3 @@
+xν 0@ajOq c"!DDK1
+h_ZʣAC[saȞpI#lBq׼4Z"(yGFd#y[
+X[[J/psL6oAXሂo7ԸEc \ No newline at end of file