Mercurial > vim
view src/libvterm/README @ 20716:3f0826b19029
Also fix the patch number.
Commit: https://github.com/vim/vim/commit/87fda407f8ecf947ba6ce72ac21f69ff04d909cd
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 6 13:25:31 2020 +0200
Also fix the patch number.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 06 Jun 2020 13:30:04 +0200 |
parents | e02d45e302a2 |
children | 808edde1e97d |
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 find the diff of a libvterm patch 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.