diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-13 11:47:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-13 11:48:00 -0800 |
| commit | 6f5e880c68099b185e60b2492c75e506e16d8292 (patch) | |
| tree | 26e8f90358a85a9f122667d1c124798d8c0cffc4 /t/t4150-am.sh | |
| parent | 624d3519c9adda89de57e54de5e502474d871974 (diff) | |
| parent | 58d4203aa617293d1dc3746a1ea33d84eb766e0f (diff) | |
| download | git-6f5e880c68099b185e60b2492c75e506e16d8292.tar.gz git-6f5e880c68099b185e60b2492c75e506e16d8292.tar.xz | |
Sync with maint
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4150-am.sh')
| -rwxr-xr-x | t/t4150-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 8807b602a..f1b60b856 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -136,7 +136,7 @@ test_expect_success setup ' git format-patch -M --stdout lorem^ >rename-add.patch && # reset time - unset test_tick && + sane_unset test_tick && test_tick ' |