Merge branch 'master' of git://ozlabs.org/~paulus/gitk
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"