summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2010-07-04 06:48:35 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-05 11:54:50 -0700
commit6b097788f88a29d6e171af7a9e87117cf992e833 (patch)
tree84766fade9042215098fedba4aa698b6190dee51 /merge-file.c
parentrerere.txt: Document forget subcommand (diff)
downloadtgif-6b097788f88a29d6e171af7a9e87117cf992e833.tar.xz
t0006: test timezone parsing
Previously, test-date simply ignored the parsed timezone and told show_date() to use UTC. Instead, let's print out what we actually parsed. While we're at it, let's make it easy for tests to work in a specific timezone. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions