diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-08-14 06:22:29 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-08-14 06:22:29 +0400 |
commit | a0653d550524a0263d36fde6a8cf98941dd057ab (patch) | |
tree | b42d7ac9fd85f20920d8efd97c472724f544f416 /builtin-merge-file.c | |
parent | 8caa3acf3a5f660b6b4c01fe23c05094140795d6 (diff) | |
parent | 21926fe885aa6579f7aa0e89fcb6a9064f8aa516 (diff) |
Merge branch 'maint'
* maint:
t5304-prune: adjust file mtime based on system time rather than file mtime
Fix escaping of glob special characters in pathspecs
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions