mergetools / gvimdiff2on commit Merge branch 'en/status-multiple-renames-to-the-same-target-fix' into maint (254db30)
   1. "$MERGE_TOOLS_DIR/vimdiff"