Merge branch 'ss/commit-squash-msg'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"