summaryrefslogtreecommitdiff
path: root/t/t9502-gitweb-standalone-parse-output.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-03 14:08:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-03 14:08:12 -0700
commit10b8084ee1be90227dff570fee8a57d183e7ae07 (patch)
tree0f9ec14826b2bb775183faa7fc479b2c17a9c00e /t/t9502-gitweb-standalone-parse-output.sh
parentSync with maint (diff)
parentmerge-recursive: do not check working copy when creating a virtual merge base (diff)
downloadtgif-10b8084ee1be90227dff570fee8a57d183e7ae07.tar.xz
Merge branch 'en/merge-fixes'
"merge-recursive" strategy incorrectly checked if a path that is involved in its internal merge exists in the working tree. * en/merge-fixes: merge-recursive: do not check working copy when creating a virtual merge base merge-recursive: remove duplicate code
Diffstat (limited to 't/t9502-gitweb-standalone-parse-output.sh')
0 files changed, 0 insertions, 0 deletions