Mercurial > vim
view src/libvterm/README @ 28879:73d490493dc6 v8.2.4962
patch 8.2.4962: files show up in git status
Commit: https://github.com/vim/vim/commit/5a8fad32ea9c075f045b37d6c7739891d458f82b
Author: shane.xb.qian <shane.qian@foxmail.com>
Date: Mon May 16 11:14:09 2022 +0100
patch 8.2.4962: files show up in git status
Problem: Files show up in git status.
Solution: Adjust the list of ignored files. Clean up more test files.
(Shane xb Qian, closes #9929)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 16 May 2022 12:15:04 +0200 |
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.