merge-recursive: Fix code checking for D/F conflicts still being present

diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index 1d4d0a5c7d2549c67334a8d5dd3f462962db81f2..f87abb5a0682d7a2fc7c3947789301c4157d331d 100755 (executable)
--- 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