mergetools / vimdiff2on commit Merge branch 'tb/pull-ff-rebase-autostash' (35898ea)
   1. "$MERGE_TOOLS_DIR/vimdiff"