summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-06-17 10:15:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-06-17 10:15:18 -0700
commita3e6b426b95e5a31a884101b7bea4e5d075aea06 (patch)
treea4ae23d11e7bd12edac2a70c05131a4a6b6549a7 /xdiff-interface.h
parentMerge branch 'ds/topo-traversal-using-commit-graph' (diff)
parentmark_fsmonitor_valid(): mark the index as changed if needed (diff)
downloadtgif-a3e6b426b95e5a31a884101b7bea4e5d075aea06.tar.xz
Merge branch 'js/fsmonitor-unflake'
The data collected by fsmonitor was not properly written back to the on-disk index file, breaking t7519 tests occasionally, which has been corrected. * js/fsmonitor-unflake: mark_fsmonitor_valid(): mark the index as changed if needed fill_stat_cache_info(): prepare for an fsmonitor fix
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions