mergetools / gvimdiff3on commit Merge branch 'ab/cred-netrc-no-autodie' (094381e)
   1. "$MERGE_TOOLS_DIR/vimdiff"