diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-22 23:56:22 +0000 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-02-04 10:29:41 +0000 |
commit | b8823c2b1c2962edd7b2bf550266d4f136100182 (patch) | |
tree | fcbe5be55a7b05ed9231712440da52ad4968d793 /tests/resources/merge-recursive/.gitted/objects/61 | |
parent | afcaf35eda87028705012e9deab75bf282be72f3 (diff) | |
download | libgit2-b8823c2b1c2962edd7b2bf550266d4f136100182.tar.gz |
Add failing test case for virtual commit merge base issue
Diffstat (limited to 'tests/resources/merge-recursive/.gitted/objects/61')
-rw-r--r-- | tests/resources/merge-recursive/.gitted/objects/61/6d1209afac499b005f68309e1593b44899b054 | bin | 0 -> 69 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/resources/merge-recursive/.gitted/objects/61/6d1209afac499b005f68309e1593b44899b054 b/tests/resources/merge-recursive/.gitted/objects/61/6d1209afac499b005f68309e1593b44899b054 Binary files differnew file mode 100644 index 000000000..6a06214d7 --- /dev/null +++ b/tests/resources/merge-recursive/.gitted/objects/61/6d1209afac499b005f68309e1593b44899b054 |