mergetools / gvimdiff2on commit submodule-config: keep configured branch around (b5944f3)
   1. "$MERGE_TOOLS_DIR/vimdiff"