view src/libvterm/README @ 18722:3bc59131171f

Cirrus CI: add a simple CI using BSD Commit: https://github.com/vim/vim/commit/e307073680d498b113c7df8250abd5676de1ed13 Author: Christian Brabandt <cb@256bit.org> Date: Wed Nov 27 15:45:57 2019 +0100 Cirrus CI: add a simple CI using BSD Cirrus CI allows to run CI tests in a wide variety of systems, such as Mac, Windows and FreeBSD. For a starter, add a Cirrus-CI test just for FreeBSD using version 12, assuming Windows and Linux are already tested using appveyor and Travis CI
author Bram Moolenaar <Bram@vim.org>
date Wed, 27 Nov 2019 16:15: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.