summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorLibravatar Ben Peart <peartben@gmail.com>2018-07-27 12:59:42 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-27 11:15:18 -0700
commit92203e6432cd77c3dfc82bd475a4c802085cffcb (patch)
tree4a4b053f101de654bdbb2f3a4805dee1fb96dc50 /Documentation/git-branch.txt
parentGit 2.18 (diff)
downloadtgif-92203e6432cd77c3dfc82bd475a4c802085cffcb.tar.xz
t3507: add a testcase showing failure with sparse checkout
Recent changes in merge_content() induced a bug when merging files that are not present in the local working directory due to sparse-checkout. Add a test case to demonstrate the bug so that we can ensure the fix resolves it and to prevent future regressions. Signed-off-by: Ben Peart <benpeart@microsoft.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-branch.txt')
0 files changed, 0 insertions, 0 deletions