Merge branch 'am/pathspec-f-f-checkout'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"