mergetools / gvimdiff3on commit Merge branch 'sb/pull-rebase-submodule' (c9c63ee)
   1. "$MERGE_TOOLS_DIR/vimdiff"