mergetools / gvimdiff2on commit Merge branch 'fc/do-not-use-the-index-in-add-to-index' into maint (ac5611a)
   1. "$MERGE_TOOLS_DIR/vimdiff"