Mercurial > vim
view src/libvterm/README @ 19023:9afeb0d2c4ab v8.2.0072
patch 8.2.0072: memory test still fails on Cirrus CI
Commit: https://github.com/vim/vim/commit/bb062c1588c324a1ce4cf01fd5e0780e83aaabe4
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jan 1 15:26:32 2020 +0100
patch 8.2.0072: memory test still fails on Cirrus CI
Problem: Memory test still fails on Cirrus CI.
Solution: Allow for a tiny bit more tolerance in the upper limit.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 01 Jan 2020 15:30: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.