Mercurial > vim
view src/libvterm/README @ 19641:73b2c928a8aa
patch 8.2.0377: no CI test for a big-endian system
Commit: https://github.com/vim/vim/commit/d47e6f0b4cc82e3ccdc4605bb1811861a5b2d115
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Mar 13 15:44:49 2020 +0100
patch 8.2.0377: no CI test for a big-endian system
Problem: No CI test for a big-endian system.
Solution: Test with s390x. (James McCoy, closes https://github.com/vim/vim/issues/5772)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 13 Mar 2020 15:45:06 +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.