Mercurial > vim
view src/libvterm/README @ 20804:ad15725594f8 v8.2.0954
patch 8.2.0954: not all desktop files are recognized
Commit: https://github.com/vim/vim/commit/f1f0ff9557353c9a452aac8540411a88cf2da47c
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jun 10 22:07:52 2020 +0200
patch 8.2.0954: not all desktop files are recognized
Problem: Not all desktop files are recognized.
Solution: Add the *.directory pattern. (Eisuke Kawashima, closes https://github.com/vim/vim/issues/3317)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 10 Jun 2020 22:15:03 +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.