Merge branch 'as/sample-push-to-checkout-hook'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"