mergetools / vimdiff3on commit Merge branch 'bw/protocol-v2' (5e6140e)
   1. "$MERGE_TOOLS_DIR/vimdiff"