mergetools / gvimdiff2on commit Merge branch 'sg/line-log-tree-diff-optim' (de67293)
   1. "$MERGE_TOOLS_DIR/vimdiff"