summaryrefslogtreecommitdiff
path: root/t/t4018/cpp-union-definition
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-02 15:30:45 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-02 15:30:45 -0700
commitc99033060ff7511864e404c18040ffa236f81404 (patch)
tree087e4db68336f821b532e01b409af338a9ea05af /t/t4018/cpp-union-definition
parentMerge branch 'en/t6036-merge-recursive-tests' (diff)
parentt7405: verify 'merge --abort' works after submodule/path conflicts (diff)
downloadtgif-c99033060ff7511864e404c18040ffa236f81404.tar.xz
Merge branch 'en/t7405-recursive-submodule-conflicts'
Tests to cover conflict cases that involve submodules have been added for merge-recursive. * en/t7405-recursive-submodule-conflicts: t7405: verify 'merge --abort' works after submodule/path conflicts t7405: add a directory/submodule conflict t7405: add a file/submodule conflict
Diffstat (limited to 't/t4018/cpp-union-definition')
0 files changed, 0 insertions, 0 deletions