diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-25 14:57:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-25 14:57:07 -0700 |
| commit | 5d5be8167db3bcaf9836cac7fdd785c564484e06 (patch) | |
| tree | c047cd686a6dff78ac30763cd122cd4e88132a2e /git-merge-one-file.sh | |
| parent | 1302c9f514686e32065130ec9a80eb0db224e819 (diff) | |
| parent | b3325dfc64017c7b8f982171a084d5d22aad8e14 (diff) | |
| download | git-5d5be8167db3bcaf9836cac7fdd785c564484e06.tar.gz git-5d5be8167db3bcaf9836cac7fdd785c564484e06.tar.xz | |
Merge branch 'nd/dwim-wildcards-as-pathspecs'
Test updates for Windows.
* nd/dwim-wildcards-as-pathspecs:
t2019: skip test requiring '*' in a file name non Windows
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions