summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-26 16:11:28 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-26 16:11:28 -0700
commit1f7a2abcc18ec1080905dc5cd59381f7ac1c8111 (patch)
tree9264980e7165c0ee6bf550176ef75fe0a7ecd297 /git-merge-one-file.sh
parent588150b0231ee342ed528292a2205f4049b3dcb1 (diff)
parentee646eb48f9a7fc6c225facf2b7449a8a65ef8f2 (diff)
downloadgit-1f7a2abcc18ec1080905dc5cd59381f7ac1c8111.tar.gz
Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6
* hl/iso8601-more-zone-formats: date.c: Support iso8601 timezone formats
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions