mergetools / gvimdiff2on commit Merge branch 'av/wincred-with-at-in-username-fix' (c2d081c)
   1. "$MERGE_TOOLS_DIR/vimdiff"