Merge branch 'jk/merge-file-exit-code'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"