| commit | 125370459178b0ca3acc98edca774c390c9b9fa4 | [log] [tgz] |
|---|---|---|
| author | Bram Moolenaar <Bram@vim.org> | Thu Jun 06 22:50:35 2019 +0200 |
| committer | Bram Moolenaar <Bram@vim.org> | Thu Jun 06 22:50:35 2019 +0200 |
| tree | 296eefc52a5cd8cc65b934ef40abafab9ea12653 | |
| parent | 773a97c254d02784079fb3b20447620412588850 [diff] [blame] |
patch 8.1.1486: a listener change is merged even when it adds a line Problem: A listener change is merged even when it adds a line. (Paul Jolly) Solution: Do not merge a change that adds or removes a line. (closes #4490)
diff --git a/src/version.c b/src/version.c index 4c44f2e..bfda618 100644 --- a/src/version.c +++ b/src/version.c
@@ -768,6 +768,8 @@ static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1486, +/**/ 1485, /**/ 1484,