mergetools / vimdiff3on commit add, reset: ensure submodules can be added or reset (5556808)
   1. "$MERGE_TOOLS_DIR/vimdiff"