diff options
| author | Olivier Marin <dkr@freesurf.fr> | 2008-06-17 18:34:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-17 16:40:09 -0700 |
| commit | 8c6b57860d9be5f346c9589a08c9e7c04eeaf99b (patch) | |
| tree | a343d2f84314a6484ab5545d0810fafd655cad70 /git-mergetool.sh | |
| parent | 1d9b26562e12fabd60bb4174b7e6b10f4f4a0ec8 (diff) | |
| download | git-8c6b57860d9be5f346c9589a08c9e7c04eeaf99b.tar.gz git-8c6b57860d9be5f346c9589a08c9e7c04eeaf99b.tar.xz | |
Fix approxidate("never") to always return 0
Commit af66366a9feb0194ed04b1f538998021ece268a8 introduced the keyword
"never" to be used with approxidate() but defined it with a fixed date
without taking care of timezone. As a result approxidate() will return
a timestamp in the future with a negative timezone.
With this patch, approxidate("never") always return 0 whatever your
timezone is.
Signed-off-by: Olivier Marin <dkr@freesurf.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions