diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-08 13:22:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-08 13:22:32 -0800 |
| commit | 7e7d71e7ced3d160e45da07ef28457cb82ebd70d (patch) | |
| tree | df07136a543c6817fb19c4d05c03021e855093c0 /builtin/merge-recursive.c | |
| parent | Merge branch 'mz/oneway-merge-wo-u-no-lstat' (diff) | |
| parent | t6130-pathspec-noglob: Windows does not allow a file named "f*" (diff) | |
| download | tgif-7e7d71e7ced3d160e45da07ef28457cb82ebd70d.tar.xz | |
Merge branch 'jk/pathspec-literal'
Finishing touches to fix a test breakage on Windows
* jk/pathspec-literal:
t6130-pathspec-noglob: Windows does not allow a file named "f*"
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions