mergetools / gvimdiff3on commit Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way' (f70a50f)
   1. "$MERGE_TOOLS_DIR/vimdiff"