mergetools / gvimdiff2on commit Merge branch 'sg/t4051-fix' (603160b)
   1. "$MERGE_TOOLS_DIR/vimdiff"