From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Aug 2017 05:55:08 +0000 (-0700)
Subject: Merge branch 'jc/cutoff-config'
X-Git-Tag: v2.15.0-rc0~118
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/96352ef9b4dfeb38ec796e7eab010edfe8f978ba

Merge branch 'jc/cutoff-config'

"[gc] rerereResolved = 5.days" used to be invalid, as the variable
is defined to take an integer counting the number of days.  It now
is allowed.

* jc/cutoff-config:
rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved
rerere: represent time duration in timestamp_t internally
t4200: parameterize "rerere gc" custom expiry test
t4200: gather "rerere gc" together
t4200: make "rerere gc" test more robust
t4200: give us a clean slate after "rerere gc" tests
---

96352ef9b4dfeb38ec796e7eab010edfe8f978ba