mergetools / gvimdiff3on commit Merge branch 'kd/auto-col-with-pager-fix' (36625e2)
   1. "$MERGE_TOOLS_DIR/vimdiff"