mergetools / gvimdiff2on commit Merge branch 'ap/maint-diff-rename-avoid-overlap' (caf217a)
   1. "$MERGE_TOOLS_DIR/vimdiff"