view src/libvterm/README @ 22299:f70e23adc829

Added tag v8.2.1698 for changeset 07e48ee8c3bb67239e9459fa9037918098bcc802
author Bram Moolenaar <Bram@vim.org>
date Wed, 16 Sep 2020 21:15:06 +0200
parents 808edde1e97d
children 2d2758ffd959
line wrap: on
line source

This is a MODIFIED version of libvterm.

The original can be found:
- on the original site (tar archive and Bazaar repository):
	http://www.leonerd.org.uk/code/libvterm/
- cloned on Github:
	https://github.com/neovim/libvterm

Modifications:
- Add a .gitignore file.
- Convert from C99 to C90.
- Other changes to support embedding in Vim.

To get the latest version of libvterm you need the "bzr" command and do:
   bzr co http://bazaar.leonerd.org.uk/c/libvterm/

To find the diff of a libvterm revision edit this URL, changing "999" to the
patch number:
    https://bazaar.launchpad.net/~libvterm/libvterm/trunk/diff/999?context=3

To merge in changes from Github, do this:
- Commit any pending changes.
- Setup the merge tool:
    git config merge.tool vimdiff
    git config merge.conflictstyle diff3
    git config mergetool.prompt false
- Run the merge tool:
    git mergetool
  This will open a four-way diff between:
     LOCAL  - your current version
     BASE   - version as it was at your last sync
     REMOTE - version at head on Github
     MERGED - best-effort merge of LOCAL and REMOTE
  Now find places where automatic merge didn't work, they are marked with
  <<<<<<<<, ======= and >>>>>>>
  Fix those places in MERGED, remove the markers, and save the file :wqall.