Code

Merge branch 'ak/apply-non-git-epoch' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:38:56 +0000 (14:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:38:56 +0000 (14:38 -0800)
* ak/apply-non-git-epoch:
  apply: handle patches with funny filename and colon in timezone
  apply: Recognize epoch timestamps with : in the timezone

1  2 
builtin/apply.c

diff --cc builtin/apply.c
Simple merge