summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-02 22:30:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-02 22:30:39 (GMT)
commitbba1a5559cd0015165563fd01d23bbd5e52bea72 (patch)
tree52996b6408a653c15b720e3b7e04292e8f53e6b5 /builtin
parentbc6d33e87ac930286fe0bfc882b837bba4b18501 (diff)
parent6b82db9b4267ed232755d20487c42d25eaf14816 (diff)
downloadgit-bba1a5559cd0015165563fd01d23bbd5e52bea72.zip
git-bba1a5559cd0015165563fd01d23bbd5e52bea72.tar.gz
git-bba1a5559cd0015165563fd01d23bbd5e52bea72.tar.bz2
Merge branch 'en/t6036-recursive-corner-cases'
Tests to cover more D/F conflict cases have been added for merge-recursive. * en/t6036-recursive-corner-cases: t6036: fix broken && chain in sub-shell t6036: add lots of detail for directory/file conflicts in recursive case
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions