mergetools / gvimdiffon commit Merge branch 'nd/magic-pathspec' into maint (c8b928d)
   1. "$MERGE_TOOLS_DIR/vimdiff"