summaryrefslogtreecommitdiff
path: root/uvim/src/libvterm/README
diff options
context:
space:
mode:
authorMehmet Samet Duman <yongdohyun@projecttick.org>2026-04-04 12:41:27 +0300
committerMehmet Samet Duman <yongdohyun@projecttick.org>2026-04-04 12:41:27 +0300
commit4f2d36194b4f299aa7509d815c07121039ea833b (patch)
treef3ded014bad3a4c76ff6a22b8726ebaab68c3d13 /uvim/src/libvterm/README
parent5b578e70c314723a3cde5c9bfc2be0bf1dadc93b (diff)
downloadProject-Tick-4f2d36194b4f299aa7509d815c07121039ea833b.tar.gz
Project-Tick-4f2d36194b4f299aa7509d815c07121039ea833b.zip
NOISSUE change uvim folder name to mnv
Signed-off-by: Mehmet Samet Duman <yongdohyun@projecttick.org>
Diffstat (limited to 'uvim/src/libvterm/README')
-rw-r--r--uvim/src/libvterm/README39
1 files changed, 0 insertions, 39 deletions
diff --git a/uvim/src/libvterm/README b/uvim/src/libvterm/README
deleted file mode 100644
index a04a777ac8..0000000000
--- a/uvim/src/libvterm/README
+++ /dev/null
@@ -1,39 +0,0 @@
-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/neomnv/libvterm
-
-Modifications:
-- revisions up to 839 have been included
-- Added a .gitignore file.
-- use TRUE and FALSE instead of true and false
-- use int or unsigned int instead of bool
-- Converted some code from C99 to C90.
-- Other changes to support embedding in MNV.
-
-To get the latest version of libvterm you need the "bzr" command and do:
- bzr co http://bazaar.leonerd.org.uk/c/libvterm/
-
-To find the diff of a libvterm revision edit this URL, changing "999" to the
-patch number:
- https://bazaar.launchpad.net/~libvterm/libvterm/trunk/diff/999?context=3
-
-To merge in changes from Github, do this:
-- Commit any pending changes.
-- Setup the merge tool:
- git config merge.tool mnvdiff
- 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.