Merge branch 'jc/pager-configuration-doc'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"