mergetools / gvimdiff2on commit Merge branch 'rs/checkout-some-states-are-const' into maint (3a3bb36)
   1. "$MERGE_TOOLS_DIR/vimdiff"