summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Adam Dinwoodie <adam@dinwoodie.org>2017-10-31 13:19:03 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-01 10:44:55 +0900
commitf21d60b4299378f4d99b9d234ae013f81661e838 (patch)
tree82a7d01cc97e2e56b9eaa21e701b9479eb12b680 /t/t3507-cherry-pick-conflict.sh
parentGit 2.14.3 (diff)
downloadtgif-f21d60b4299378f4d99b9d234ae013f81661e838.tar.xz
t5580: add Cygwin support
t5580 tests that specifying Windows UNC paths works with Git. Cygwin supports UNC paths, albeit only using forward slashes, not backslashes, so run the compatible tests on Cygwin as well as MinGW. The only complication is Cygwin's `pwd`, which returns a *nix-style path, and that's not suitable for calculating the UNC path to the current directory. Instead use Cygwin's `cygpath` utility to get the Windows-style path. Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions