mergetools / vimdiff3on commit Merge branch 'jk/test-annoyances' (07da4e0)
   1. "$MERGE_TOOLS_DIR/vimdiff"