Merge branch 'tz/fsf-address-update' of ../git-gui into tz/fsf-address-update
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"