diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 02:44:24 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-06 02:44:24 +0000 |
| commit | 8baab3c8d7a6f22888bd581cd5c6098fd2e4b5a8 (patch) | |
| tree | 3537e168b860f2742f6029d70501b5ed7d15d345 /src/libvterm/README | |
| parent | Initial commit. (diff) | |
| download | vim-8baab3c8d7a6f22888bd581cd5c6098fd2e4b5a8.tar.xz vim-8baab3c8d7a6f22888bd581cd5c6098fd2e4b5a8.zip | |
Adding upstream version 2:8.1.0875.upstream/2%8.1.0875upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/libvterm/README')
| -rw-r--r-- | src/libvterm/README | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/libvterm/README b/src/libvterm/README new file mode 100644 index 0000000..208066b --- /dev/null +++ b/src/libvterm/README @@ -0,0 +1,30 @@ +This is a MODIFIED version of libvterm. + +The original can be found: +- on the original site (tar archive and Bazaar repository): + http://www.leonerd.org.uk/code/libvterm/ +- cloned on Github: + https://github.com/neovim/libvterm + +Modifications: +- Add a .gitignore file. +- Convert from C99 to C90. +- Other changes to support embedding in Vim. + + +To merge in changes from Github, do this: +- Commit any pending changes. +- Setup the merge tool: + git config merge.tool vimdiff + git config merge.conflictstyle diff3 + git config mergetool.prompt false +- Run the merge tool: + git mergetool + This will open a four-way diff between: + LOCAL - your current version + BASE - version as it was at your last sync + REMOTE - version at head on Github + MERGED - best-effort merge of LOCAL and REMOTE + Now find places where automatic merge didn't work, they are marked with + <<<<<<<<, ======= and >>>>>>> + Fix those places in MERGED, remove the markers, and save the file :wqall. |