Merge gitk to pick up emergency build fix
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"