mergetools / gvimdiff3on commit rebase --root: stop assuming squash_onto is unset (bb2ac4f)
   1. "$MERGE_TOOLS_DIR/vimdiff"