Merge branch 'mm/detach-at-HEAD-reflog' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"