Merge branch 'jk/rerere-forget-check-enabled' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"