Mercurial > vim
view src/libvterm/README @ 26354:7e7d0e01a2d0 v8.2.3708
patch 8.2.3708: Vim9: test fails with different error
Commit: https://github.com/vim/vim/commit/69535d8a0a1ba09047fc1b5bed86a8965302a4fa
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Nov 30 21:39:39 2021 +0000
patch 8.2.3708: Vim9: test fails with different error
Problem: Vim9: test fails with different error.
Solution: Correct the error number.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 30 Nov 2021 22:45:02 +0100 |
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.