Merge branch 'je/pager-do-not-recurse'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"