| commit | 2ace172f95f4afdc565bbcbc2373ebf33b8a9371 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Dec 2017 17:09:03 +0000 (6 09:09 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Dec 2017 17:09:03 +0000 (6 09:09 -0800) | ||
| tree | ac3e29bc34a5fb15b160fcc7cc3c3e53d85f0fb0 | treesnapshot (tar.gz zip) |
| parent | 0175b6e2b9f99101b37cd4b1aa61711678a17105 | commitdiff |
| parent | c641ca67072946f95f87e7b21f13f3d4e73701e3 | commitdiff |
Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' into maint
The three-way merge performed by "git cherry-pick" was confused
when a new submodule was added in the meantime, which has been
fixed (or "papered over").
* sb/test-cherry-pick-submodule-getting-in-a-way:
merge-recursive: handle addition of submodule on our side of history
t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
The three-way merge performed by "git cherry-pick" was confused
when a new submodule was added in the meantime, which has been
fixed (or "papered over").
* sb/test-cherry-pick-submodule-getting-in-a-way:
merge-recursive: handle addition of submodule on our side of history
t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure