aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/diff.c2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 5940dc55da..11ade20c1c 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -129,7 +129,7 @@ void diff_buf_add(buf_T *buf)
}
}
- EMSGN(_("E96: Can not diff more than %" PRId64 " buffers"), DB_COUNT);
+ EMSGN(_("E96: Cannot diff more than %" PRId64 " buffers"), DB_COUNT);
}
/// Find buffer "buf" in the list of diff buffers for the current tab page.
diff --git a/src/nvim/version.c b/src/nvim/version.c
index c4d31c4abe..e39ba83e8b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -305,7 +305,7 @@ static int included_patches[] = {
// 2138 NA
2137,
2136,
- // 2135,
+ 2135,
2134,
// 2133 NA
// 2132 NA