mergetools / vimdiff3on commit Merge branch 'jk/stash-disable-renames-internally' (db09f21)
   1. "$MERGE_TOOLS_DIR/vimdiff"