mergetools / gvimdiffon commit Merge branch 'rs/move-array' into maint (d3b7ee0)
   1. "$MERGE_TOOLS_DIR/vimdiff"