Skip to content

Update diff.{txt,jax} #2355

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
Oct 17, 2025
Merged

Update diff.{txt,jax} #2355

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 Oct 12
*diff.txt* For Vim バージョン 9.1. Last change: 2025 Oct 14


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 Oct 12
*diff.txt* For Vim version 9.1. Last change: 2025 Oct 14


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -139,7 +139,7 @@ file for a moment and come back to the same file and be in diff mode again.
buffers.

The `:diffoff` command resets the relevant options to the values they had when
using `:diffsplit`, `:diffpatch`, `:diffthis`. or starting Vim in diff mode.
using `:diffsplit`, `:diffpatch`, `:diffthis`, or starting Vim in diff mode.
When using `:diffoff` twice the last saved values are restored.
Otherwise they are set to their default value:

Expand Down