mergetools / gvimdiff2on commit Merge branch 'ds/feature-macros' (f4f8dfe)
   1. "$MERGE_TOOLS_DIR/vimdiff"