mergetools / vimdiff3on commit Merge branch 'jk/notes-merge-from-anywhere' (1cb3ed3)
   1. "$MERGE_TOOLS_DIR/vimdiff"