diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-10-22 20:20:07 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-11-25 15:37:11 -0500 |
| commit | 86c8d02c071d3713e1c9f0b95d9f4599108d2c29 (patch) | |
| tree | 21b137a4bd2d54eb1065d523235d9d57e4a9f54d /tests/resources/merge-recursive/.gitted/objects/4c/49317a0912ca559d2048bc329994eb7d10474f | |
| parent | fa78782f67d17c5b139a2bbe3ceefe54c8c71dd3 (diff) | |
| download | libgit2-86c8d02c071d3713e1c9f0b95d9f4599108d2c29.tar.gz | |
merge: add simple recursive test
Add a simple recursive test - where multiple ancestors exist and
creating a virtual merge base from them would prevent a conflict.
Diffstat (limited to 'tests/resources/merge-recursive/.gitted/objects/4c/49317a0912ca559d2048bc329994eb7d10474f')
| -rw-r--r-- | tests/resources/merge-recursive/.gitted/objects/4c/49317a0912ca559d2048bc329994eb7d10474f | bin | 0 -> 183 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/resources/merge-recursive/.gitted/objects/4c/49317a0912ca559d2048bc329994eb7d10474f b/tests/resources/merge-recursive/.gitted/objects/4c/49317a0912ca559d2048bc329994eb7d10474f Binary files differnew file mode 100644 index 000000000..d7bb4d37c --- /dev/null +++ b/tests/resources/merge-recursive/.gitted/objects/4c/49317a0912ca559d2048bc329994eb7d10474f |