mergetools / gvimdiff2on commit Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint (cb4575f)
   1. "$MERGE_TOOLS_DIR/vimdiff"