Merge branch 'ac/complete-pull-autostash'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"