blob: a5b0377af06ad3bded3faa8296e3bdb3cf6dd550 [file] [log] [blame]
Bram Moolenaare4f25e42017-07-07 11:54:15 +02001This is a MODIFIED version of libvterm.
2
3The original can be found:
Bram Moolenaar9cc5f752017-07-23 22:07:27 +02004- on the original site (tar archive and Bazaar repository):
Bram Moolenaare4f25e42017-07-07 11:54:15 +02005 http://www.leonerd.org.uk/code/libvterm/
Bram Moolenaar9cc5f752017-07-23 22:07:27 +02006- cloned on Github:
Bram Moolenaare4f25e42017-07-07 11:54:15 +02007 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.
Bram Moolenaarb5b49a32018-03-25 16:20:37 +020013
Bram Moolenaar02c037a2020-08-30 19:26:45 +020014To 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:
Bram Moolenaare178ba32020-05-17 14:59:47 +020019 https://bazaar.launchpad.net/~libvterm/libvterm/trunk/diff/999?context=3
Bram Moolenaarb5b49a32018-03-25 16:20:37 +020020
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.