mergetools / gvimdiffon commit Merge branch 'js/wincred-empty-cred' into maint (558d856)
   1. "$MERGE_TOOLS_DIR/vimdiff"