1e4f25e4aSBram MoolenaarThis is a MODIFIED version of libvterm. 2e4f25e4aSBram Moolenaar 3e4f25e4aSBram MoolenaarThe original can be found: 49cc5f759SBram Moolenaar- on the original site (tar archive and Bazaar repository): 5e4f25e4aSBram Moolenaar http://www.leonerd.org.uk/code/libvterm/ 69cc5f759SBram Moolenaar- cloned on Github: 7e4f25e4aSBram Moolenaar https://github.com/neovim/libvterm 8e4f25e4aSBram Moolenaar 9e4f25e4aSBram MoolenaarModifications: 10e4f25e4aSBram Moolenaar- Add a .gitignore file. 11e4f25e4aSBram Moolenaar- Convert from C99 to C90. 12e4f25e4aSBram Moolenaar- Other changes to support embedding in Vim. 13*b5b49a3bSBram Moolenaar 14*b5b49a3bSBram Moolenaar 15*b5b49a3bSBram MoolenaarTo merge in changes from Github, do this: 16*b5b49a3bSBram Moolenaar- Commit any pending changes. 17*b5b49a3bSBram Moolenaar- Setup the merge tool: 18*b5b49a3bSBram Moolenaar git config merge.tool vimdiff 19*b5b49a3bSBram Moolenaar git config merge.conflictstyle diff3 20*b5b49a3bSBram Moolenaar git config mergetool.prompt false 21*b5b49a3bSBram Moolenaar- Run the merge tool: 22*b5b49a3bSBram Moolenaar git mergetool 23*b5b49a3bSBram Moolenaar This will open a four-way diff between: 24*b5b49a3bSBram Moolenaar LOCAL - your current version 25*b5b49a3bSBram Moolenaar BASE - version as it was at your last sync 26*b5b49a3bSBram Moolenaar REMOTE - version at head on Github 27*b5b49a3bSBram Moolenaar MERGED - best-effort merge of LOCAL and REMOTE 28*b5b49a3bSBram Moolenaar Now find places where automatic merge didn't work, they are marked with 29*b5b49a3bSBram Moolenaar <<<<<<<<, ======= and >>>>>>> 30*b5b49a3bSBram Moolenaar Fix those places in MERGED, remove the markers, and save the file :wqall. 31