view src/libvterm/README @ 19659:bc70c52c5c12 v8.2.0386

patch 8.2.0386: part from unfinished patch got included Commit: https://github.com/vim/vim/commit/0bdbc10e8a74e7dd447cd975fb1445bbdcbb4f37 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 15 16:51:40 2020 +0100 patch 8.2.0386: part from unfinished patch got included Problem: Part from unfinished patch got included. Solution: Undo that part.
author Bram Moolenaar <Bram@vim.org>
date Sun, 15 Mar 2020 17:00:04 +0100
parents 9f857e6310b6
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.