mergetools / gvimdiff2on commit Merge branch 'nd/test-helpers' (ef687db)
   1. "$MERGE_TOOLS_DIR/vimdiff"