Merge branch 'hw/commit-advise-while-rejecting' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"