aboutsummaryrefslogtreecommitdiffstats
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2025-05-21 19:05:10 +0000
committerJunio C Hamano <gitster@pobox.com>2025-06-06 15:05:47 -0700
commit3717a5775a7ba9e5f5b2794171ab205c0a177ef8 (patch)
treeca7c612205e5a019ef1a8c43357c81b856c17667 /mergetools/vimdiff
parent8613c2bb6cd16ef530dc5dd74d3b818a1ccbf1c0 (diff)
downloadgit-3717a5775a7ba9e5f5b2794171ab205c0a177ef8.tar.gz
doc: update references to renamed AsciiDoc files
The .txt extensions were changed to .adoc in 1f010d6 (doc: use .adoc extension for AsciiDoc files, 2025-01-20). References to the renamed files were not updated yet. Signed-off-by: Jouke Witteveen <j.witteveen@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/vimdiff')
-rw-r--r--mergetools/vimdiff4
1 files changed, 2 insertions, 2 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 78710858e8..fca1044f65 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -274,8 +274,8 @@ gen_cmd () {
# definition.
#
# The syntax of the "layout definitions" is explained in "Documentation/
- # mergetools/vimdiff.txt" but you can already intuitively understand how
- # it works by knowing that...
+ # mergetools/vimdiff.adoc" but you can already intuitively understand
+ # how it works by knowing that...
#
# * "+" means "a new vim tab"
# * "/" means "a new vim horizontal split"