mergetools / gvimdiff2on commit am: return control to caller, for housekeeping (a1549e1)
   1. "$MERGE_TOOLS_DIR/vimdiff"