Mercurial > vim
view src/testdir/dumps/Test_conceal_cul_03.dump @ 18267:da6a7491e148 v8.1.2128
patch 8.1.2128: renamed libvterm sources makes merging difficult
Commit: https://github.com/vim/vim/commit/93268054428fe3a6bbe3f89d2def2fec4eabcf5f
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 10 13:22:54 2019 +0200
patch 8.1.2128: renamed libvterm sources makes merging difficult
Problem: Renamed libvterm sources makes merging difficult.
Solution: Rename back to the original name and only rename the .o files.
Also clean the libvterm build artifacts. (James McCoy,
closes #5027)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 10 Oct 2019 13:30:04 +0200 |
parents | 5b0f37d844b3 |
children |
line wrap: on
line source
|o+0&#ffffff0|n|e| @71 |t|w|o| @71 |t+8&&|h|r|e@1| @69 |f+0&&|o|u|r| @70 |f|i|v|e| @70 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|3|,|1| @11|A|l@1 > +8&&@74 |t+0&&|h|i|s| |i|s| |a| |t|e|s|t| @60 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |~| @73 |~| @73 |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|0|-|1| @9|A|l@1 |:+0&&|w|i|n|c|m|d| |w| @65