mergetools / gvimdiffon commit Merge branch 'nd/format-patch-stat-width' into next (c03e8a0)
   1. "$MERGE_TOOLS_DIR/vimdiff"