Merge remote-tracking branch 'paulus/master' into pm/gitk-update
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"