mergetools / vimdiff3on commit Merge branch 'rr/rebase-autostash-fix' (4a43d4f)
   1. "$MERGE_TOOLS_DIR/vimdiff"