mergetools / gvimdiff3on commit Merge branch 'jk/diff-submodule-diff-inline' (a531ecf)
   1. "$MERGE_TOOLS_DIR/vimdiff"