mergetools / gvimdiffon commit Merge branch 'bw/pathspec-remove-unused-extern-decl' into maint (9e2c4fa)
   1. "$MERGE_TOOLS_DIR/vimdiff"