mergetools / gvimdiff3on commit Merge branch 'jk/stash-disable-renames-internally' into maint (12361d0)
   1. "$MERGE_TOOLS_DIR/vimdiff"