diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:09:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:09:03 -0800 |
| commit | 2ace172f95f4afdc565bbcbc2373ebf33b8a9371 (patch) | |
| tree | ac3e29bc34a5fb15b160fcc7cc3c3e53d85f0fb0 /daemon.c | |
| parent | Merge branch 'pw/sequencer-recover-from-unlockable-index' into maint (diff) | |
| parent | merge-recursive: handle addition of submodule on our side of history (diff) | |
| download | tgif-2ace172f95f4afdc565bbcbc2373ebf33b8a9371.tar.xz | |
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
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions