Merge branch 'ks/prepare-commit-msg-sample'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"