diff options
| author | David Turner <dturner@twosigma.com> | 2017-12-04 16:56:07 -0500 |
|---|---|---|
| committer | David Turner <dturner@twosigma.com> | 2017-12-04 17:15:00 -0500 |
| commit | 2a3e06359b8be1c5c53809a56e0fc3af62bdb024 (patch) | |
| tree | 150216ab9b616746994f2ecf5b04f6be71b261c0 /tests/resources | |
| parent | 429bb3575474a3d25ee1c9814612d8d01b3378e8 (diff) | |
| download | libgit2-2a3e06359b8be1c5c53809a56e0fc3af62bdb024.tar.gz | |
Do not attempt to check out submodule as blob when merging a submodule modify/deltete conflict
Diffstat (limited to 'tests/resources')
3 files changed, 3 insertions, 0 deletions
diff --git a/tests/resources/merge-resolve/.gitted/objects/50/c5dc8cdfe40c688eb0a0e23be54dd57cae2e78 b/tests/resources/merge-resolve/.gitted/objects/50/c5dc8cdfe40c688eb0a0e23be54dd57cae2e78 new file mode 100644 index 000000000..c04baa14b --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/objects/50/c5dc8cdfe40c688eb0a0e23be54dd57cae2e78 @@ -0,0 +1,2 @@ +x] +0})Jv">x/I6ZhIӞ*aeZC`F6;KLO).y8N ^ }a'Ѱ S*gpmHp_sh /O>.PiF?,kJZGoJT
\ No newline at end of file diff --git a/tests/resources/merge-resolve/.gitted/objects/7a/a825857f87aea74ddf13d954568aa30dfcdeb4 b/tests/resources/merge-resolve/.gitted/objects/7a/a825857f87aea74ddf13d954568aa30dfcdeb4 Binary files differnew file mode 100644 index 000000000..b9c06303b --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/objects/7a/a825857f87aea74ddf13d954568aa30dfcdeb4 diff --git a/tests/resources/merge-resolve/.gitted/refs/heads/delete-submodule b/tests/resources/merge-resolve/.gitted/refs/heads/delete-submodule new file mode 100644 index 000000000..1951316d5 --- /dev/null +++ b/tests/resources/merge-resolve/.gitted/refs/heads/delete-submodule @@ -0,0 +1 @@ +50c5dc8cdfe40c688eb0a0e23be54dd57cae2e78 |