mergetools / gvimdiff2on commit git-credential-netrc: adapt to test framework for git (f07eeed)
   1. "$MERGE_TOOLS_DIR/vimdiff"