mergetools / gvimdiff3on commit Merge branch 'rs/show-branch-argv-array' into maint (288fe0c)
   1. "$MERGE_TOOLS_DIR/vimdiff"