Merge branch 'jc/revision-range-unpeel' into maint
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"