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 find the diff of a libvterm patch edit this URL, changing "999" to the patch 15number: 16 https://bazaar.launchpad.net/~libvterm/libvterm/trunk/diff/999?context=3 17 18To merge in changes from Github, do this: 19- Commit any pending changes. 20- Setup the merge tool: 21 git config merge.tool vimdiff 22 git config merge.conflictstyle diff3 23 git config mergetool.prompt false 24- Run the merge tool: 25 git mergetool 26 This will open a four-way diff between: 27 LOCAL - your current version 28 BASE - version as it was at your last sync 29 REMOTE - version at head on Github 30 MERGED - best-effort merge of LOCAL and REMOTE 31 Now find places where automatic merge didn't work, they are marked with 32 <<<<<<<<, ======= and >>>>>>> 33 Fix those places in MERGED, remove the markers, and save the file :wqall. 34