diff options
| author |  John Keeping <john@keeping.me.uk> | 2015-09-03 22:48:58 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-09-03 15:42:18 -0700 |
| commit | dc6d782c5d2526b251061daffc3e74d15c8c7095 (patch) | |
| tree | f78c12164f074845f311a2650e142f5dd3eea7ed /git-merge-resolve.sh | |
| parent | t6300: add test for "raw" date format (diff) | |
| download | tgif-dc6d782c5d2526b251061daffc3e74d15c8c7095.tar.xz | |
date: check for "local" before anything else
In a following commit we will make "local" orthogonal to the format.
Although this will not apply to "relative", which does not use the
timezone, it applies to all other formats so move the timezone
conversion to the start of the function.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions