view src/libvterm/README @ 13531:9f857e6310b6 v8.0.1639

patch 8.0.1639: libvterm code lags behind master commit https://github.com/vim/vim/commit/b5b49a3b430ea0aaf8cce6b7bc0e444f0211ddfb Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 25 16:20:37 2018 +0200 patch 8.0.1639: libvterm code lags behind master Problem: Libvterm code lags behind master. Solution: Sync to head, solve merge problems.
author Christian Brabandt <cb@256bit.org>
date Sun, 25 Mar 2018 16:30:06 +0200
parents 7846efd291d7
children e02d45e302a2
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 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.