mergetools / gvimdiffon commit Merge branch 'sb/submodule-helper-relative-path' (283badc)
   1. "$MERGE_TOOLS_DIR/vimdiff"