aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-27 11:06:34 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-27 11:06:34 +0900
commitf70a50fc48e4f3e00120153c68df1acd2a5aa382 (patch)
treecbcc26717ba17dadd6e492e5245d5406cc6f6a43 /config.c
parentc5e763083fa675629c7d936d72fb67d8f03e0846 (diff)
parentc641ca67072946f95f87e7b21f13f3d4e73701e3 (diff)
downloadgit-f70a50fc48e4f3e00120153c68df1acd2a5aa382.tar.gz
git-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 'config.c')
0 files changed, 0 insertions, 0 deletions