summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorLibravatar Michael J Gruber <git@drmicha.warpmail.net>2011-04-14 19:38:13 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-14 10:47:18 -0700
commite3b02bc9533007f9e7aa9d7738a0f92c952dcff6 (patch)
treebaf748939e503e428a7cfc7ea7cd12c4d3e7046e /Documentation/git-difftool.txt
parentgit.txt: fix list continuation (diff)
downloadtgif-e3b02bc9533007f9e7aa9d7738a0f92c952dcff6.tar.xz
t3306,t5304: avoid clock skew issues
On systems where the local time and file modification time may be out of sync (e.g. test directory on NFS) t3306 and t5305 can fail because prune compares times such as "now" (client time) with file modification times (server times for remote file systems). I.e., these are spurious test failures. Avoid this by setting the relevant modification times to the local time. Noticed on a system with as little as 2s time skew. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions