Mercurial > vim
view src/testdir/dumps/Test_conceal_two_windows_01.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 | 8b78878311e0 |
children |
line wrap: on
line source
|o+0&#ffffff0|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 |t|w|o| @1>h|e|r|e| @65 |t|h|r|e@1| @1|t|h|r|e@1| @62 |S|e|c|o|n|d| |w|i|n|d|o|w| @61 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |~| @73 |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 |o+0&&|n|e| |o|n|e| |o|n|e| |o|n|e| |o|n|e| @55 |t|w|o| @1|h|e|r|e| @65 |t|h|r|e@1| @1|t|h|r|e@1| @62 |~+0#4040ff13&| @73 |~| @73 |~| @73 |~| @73 |~| @73 |[+1#0000000&|N|o| |N|a|m|e|]| |[|+|]| @43|2|,|1|4| @10|A|l@1 |/+0&&|h|e|r|e| @69