Skip to content

Commit 8cefecf

Browse files
committed
Add a README file
1 parent 4ed2b1c commit 8cefecf

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed

README

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
This is a MODIFIED version of libvterm.
2+
3+
The 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+
9+
Modifications:
10+
- Add a .gitignore file.
11+
- Convert from C99 to C90.
12+
- Other changes to support embedding in Vim.
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.

0 commit comments

Comments
 (0)