summaryrefslogtreecommitdiff
path: root/t/t7606-merge-custom.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-02-02 13:36:55 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-02-02 13:36:55 -0800
commita482cf446f2ced7fdd67faa2b3a55bfd5caf7d58 (patch)
tree4df5673a3157e6ecaa610bb4f50371684c86e4a8 /t/t7606-merge-custom.sh
parentMerge branch 'rs/absolute-pathdup' (diff)
parentgit-p4: fix git-p4.mapUser on Windows (diff)
downloadtgif-a482cf446f2ced7fdd67faa2b3a55bfd5caf7d58.tar.xz
Merge branch 'gv/mingw-p4-mapuser'
"git p4" did not work well with multiple git-p4.mapUser entries on Windows. * gv/mingw-p4-mapuser: git-p4: fix git-p4.mapUser on Windows
Diffstat (limited to 't/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions