mergetools / vimdiff3on commit Merge branch 'jm/doc-wording-tweaks' (668668a)
   1. "$MERGE_TOOLS_DIR/vimdiff"