Merge branch 'jg/prompt-localize-temporary'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"