Mercurial > vim

comparison src/libvterm/README @ 13531:9f857e6310b6 v8.0.1639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1639: libvterm code lags behind master commit https://github.com/vim/vim/commit/b5b49a3b430ea0aaf8cce6b7bc0e444f0211ddfb Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 25 16:20:37 2018 +0200 patch 8.0.1639: libvterm code lags behind master Problem: Libvterm code lags behind master. Solution: Sync to head, solve merge problems.
author Christian Brabandt <cb@256bit.org>
date Sun, 25 Mar 2018 16:30:06 +0200
parents 7846efd291d7
children e02d45e302a2
comparison
equal deleted inserted replaced
13530:28031e9f0da4 13531:9f857e6310b6
8 8
9 Modifications: 9 Modifications:
10 - Add a .gitignore file. 10 - Add a .gitignore file.
11 - Convert from C99 to C90. 11 - Convert from C99 to C90.
12 - Other changes to support embedding in Vim. 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.