Merge branch 'jk/allow-fetch-onelevel-refname' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"