aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-29 11:43:18 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-29 11:43:18 -0700
commit04a67dc622b298226628fe344af835a7191dc1aa (patch)
tree4b0c675e0ce135634202dfb9374fef01fd414d1e /t
parenta1dd7e16ad6df793fc393d6df8e9082261a0ce42 (diff)
parentf1e9c548ce45005521892af0299696204ece286b (diff)
downloadgit-04a67dc622b298226628fe344af835a7191dc1aa.tar.gz
git-04a67dc622b298226628fe344af835a7191dc1aa.tar.xz
Merge branch 'mg/x-years-12-months' into maint
* mg/x-years-12-months: date: avoid "X years, 12 months" in relative dates
Diffstat (limited to 't')
-rwxr-xr-xt/t0006-date.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 1d4d0a5c7..f87abb5a0 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -25,6 +25,7 @@ check_show 37500000 '1 year, 2 months ago'
check_show 55188000 '1 year, 9 months ago'
check_show 630000000 '20 years ago'
check_show 31449600 '12 months ago'
+check_show 62985600 '2 years ago'
check_parse() {
echo "$1 -> $2" >expect