Merge branch 'js/for-each-ref-remote-name-and-ref'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"