mergetools / gvimdiffon commit Merge branch 'tz/credential-netrc' (1e15535)
   1. "$MERGE_TOOLS_DIR/vimdiff"