mergetools / vimdiff2on commit Merge branch 'ax/line-log-range-merge-fix' (36d5286)
   1. "$MERGE_TOOLS_DIR/vimdiff"