mergetools / gvimdiff3on commit Merge branch 'sn/reset-doc-typofix' (9bca0e5)
   1. "$MERGE_TOOLS_DIR/vimdiff"