merge-recursive: Create function for merging with branchname:file markers

diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 75b02af86d4d613fac91b3cec28044e3b7f6274e..f87abb5a0682d7a2fc7c3947789301c4157d331d 100755 (executable)
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -25,11 +25,12 @@ 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
-       test_expect_${3:-success} "parse date ($1)" "
-       test-date parse '$1' >actual &&
+       test_expect_${4:-success} "parse date ($1${3:+ TZ=$3})" "
+       TZ=${3:-$TZ} test-date parse '$1' >actual &&
        test_cmp expect actual
        "
 }
@@ -38,6 +39,8 @@ check_parse 2008 bad
 check_parse 2008-02 bad
 check_parse 2008-02-14 bad
 check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 +0000'
+check_parse '2008-02-14 20:30:45 -0500' '2008-02-14 20:30:45 -0500'
+check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 -0500' EST5
 
 check_approxidate() {
        echo "$1 -> $2 +0000" >expect