mergetools / gvimdiff2on commit Merge branch 'jl/use-vsatisfy-correctly-for-2.0' (5714722)
   1. "$MERGE_TOOLS_DIR/vimdiff"