mergetools / gvimdiff3on commit Merge branch 'sb/submodule-update-in-c' (4d6d6ef)
   1. "$MERGE_TOOLS_DIR/vimdiff"