Merge early parts from git://ozlabs.org/~paulus/gitk.git
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"