summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-13 19:22:29 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-13 19:22:29 -0700
commita0653d550524a0263d36fde6a8cf98941dd057ab (patch)
treeb42d7ac9fd85f20920d8efd97c472724f544f416 /xdiff-interface.h
parent8caa3acf3a5f660b6b4c01fe23c05094140795d6 (diff)
parent21926fe885aa6579f7aa0e89fcb6a9064f8aa516 (diff)
downloadgit-a0653d550524a0263d36fde6a8cf98941dd057ab.tar.gz
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 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions