mergetools / vimdiff3on commit Merge branch 'ds/mark-parents-uninteresting-optim' (d5120da)
   1. "$MERGE_TOOLS_DIR/vimdiff"