summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-21 05:41:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-21 05:41:03 -0700
commite7e1bf0c29f20c505869d2dda7ddb26470f6ebc5 (patch)
treeef844cfe70d017ebb1a32016d4d7fb4655764f06 /git-mergetool.sh
parentMerge branch 'jk/diff-m-doc' into maint (diff)
parentAdd "Z" as an alias for the timezone "UTC" (diff)
downloadtgif-e7e1bf0c29f20c505869d2dda7ddb26470f6ebc5.tar.xz
Merge branch 'mc/maint-zoneparse' into maint
* mc/maint-zoneparse: Add "Z" as an alias for the timezone "UTC"
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions