Merge branch 'en/checkout-mismerge-fix'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"