mergetools / vimdiff2on commit rebase -i: return control to caller, for housekeeping (15d4bf2)
   1. "$MERGE_TOOLS_DIR/vimdiff"