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