Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Aug 2008 02:22:29 +0000 (19:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Aug 2008 02:22:29 +0000 (19:22 -0700)
* maint:
t5304-prune: adjust file mtime based on system time rather than file mtime
Fix escaping of glob special characters in pathspecs

1  2 
t/t3700-add.sh
diff --cc t/t3700-add.sh
Simple merge