diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:34 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:34 +0900 |
| commit | f70a50fc48e4f3e00120153c68df1acd2a5aa382 (patch) | |
| tree | cbcc26717ba17dadd6e492e5245d5406cc6f6a43 /mergetools/gvimdiff | |
| parent | Merge branch 'tz/notes-error-to-stderr' (diff) | |
| parent | merge-recursive: handle addition of submodule on our side of history (diff) | |
| download | tgif-f70a50fc48e4f3e00120153c68df1acd2a5aa382.tar.xz | |
Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'
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 'mergetools/gvimdiff')
0 files changed, 0 insertions, 0 deletions