mergetools / gvimdiff3on commit Merge branch 'rs/status-with-removed-submodule' (103251a)
   1. "$MERGE_TOOLS_DIR/vimdiff"