Skip to content

Update diff.{txt,jax} #2316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2025
Merged

Update diff.{txt,jax} #2316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/diff.jax
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*diff.txt* For Vim バージョン 9.1. Last change: 2025 Aug 06
*diff.txt* For Vim バージョン 9.1. Last change: 2025 Sep 15


VIMリファレンスマニュアル by Bram Moolenaar
Expand Down
4 changes: 2 additions & 2 deletions en/diff.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*diff.txt* For Vim version 9.1. Last change: 2025 Aug 06
*diff.txt* For Vim version 9.1. Last change: 2025 Sep 15


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -351,7 +351,7 @@ hard to see what the actual edit on it was. You can use diff anchors to pin
that function so the diff algorithm will align based on it.

To use it, set anchors using 'diffanchors' which is a comma-separated list of
{address} in each file, and then add "anchor" to 'diffopt'. Internaly, Vim
{address} in each file, and then add "anchor" to 'diffopt'. Internally, Vim
splits each file up into sections split by the anchors. It performs the diff
on each pair of sections separately before merging the results back.

Expand Down