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