xref: /vim-8.2.3635/src/libvterm/README (revision 02c037a4)
1This is a MODIFIED version of libvterm.
2
3The original can be found:
4- on the original site (tar archive and Bazaar repository):
5	http://www.leonerd.org.uk/code/libvterm/
6- cloned on Github:
7	https://github.com/neovim/libvterm
8
9Modifications:
10- Add a .gitignore file.
11- Convert from C99 to C90.
12- Other changes to support embedding in Vim.
13
14To get the latest version of libvterm you need the "bzr" command and do:
15   bzr co http://bazaar.leonerd.org.uk/c/libvterm/
16
17To find the diff of a libvterm revision edit this URL, changing "999" to the
18patch number:
19    https://bazaar.launchpad.net/~libvterm/libvterm/trunk/diff/999?context=3
20
21To merge in changes from Github, do this:
22- Commit any pending changes.
23- Setup the merge tool:
24    git config merge.tool vimdiff
25    git config merge.conflictstyle diff3
26    git config mergetool.prompt false
27- Run the merge tool:
28    git mergetool
29  This will open a four-way diff between:
30     LOCAL  - your current version
31     BASE   - version as it was at your last sync
32     REMOTE - version at head on Github
33     MERGED - best-effort merge of LOCAL and REMOTE
34  Now find places where automatic merge didn't work, they are marked with
35  <<<<<<<<, ======= and >>>>>>>
36  Fix those places in MERGED, remove the markers, and save the file :wqall.
37