diff options
Diffstat (limited to 'tests/resources/merge-resolve/.gitted/objects/b6')
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/objects/b6/9fe837e4cecfd4c9a40cdca7c138468687df07 b/tests/resources/merge-resolve/.gitted/objects/b6/9fe837e4cecfd4c9a40cdca7c138468687df07 new file mode 100644 index 000000000..6dbcb05ea --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/objects/b6/9fe837e4cecfd4c9a40cdca7c138468687df07 @@ -0,0 +1,2 @@ +xA +1E)f7}̌!QHzZ\|OU?e!pJk<MoQ-QI>X0̒,)$;:ܷ(:
\ No newline at end of file diff --git a/tests/resources/merge-resolve/.gitted/objects/b6/f610aef53bd343e6c96227de874c66f00ee8e8 b/tests/resources/merge-resolve/.gitted/objects/b6/f610aef53bd343e6c96227de874c66f00ee8e8 Binary files differnew file mode 100644 index 000000000..fb102f15d --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/objects/b6/f610aef53bd343e6c96227de874c66f00ee8e8 |