mergetools / gvimdiff2on commit rebase --merge: return control to caller, for housekeeping (01a1e64)
   1. "$MERGE_TOOLS_DIR/vimdiff"