Merge branch 'jc/compat-util-setitimer-fix'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"