Skip to content

Commit 081b08c

Browse files
committed
Merge branch 'ja/dir-rename-doc-markup-fix'
Doc update. * ja/dir-rename-doc-markup-fix: Doc: fix misleading asciidoc formating
2 parents 0b2094b + 64eca30 commit 081b08c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/technical/directory-rename-detection.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ More interesting possibilities exist, though, such as:
2020
* one side of history renames x -> z, and the other renames some file to
2121
x/e, causing the need for the merge to do a transitive rename.
2222

23-
* one side of history renames x -> z, but also renames all files within
24-
x. For example, x/a -> z/alpha, x/b -> z/bravo, etc.
23+
* one side of history renames x -> z, but also renames all files within x.
24+
For example, x/a -> z/alpha, x/b -> z/bravo, etc.
2525

2626
* both 'x' and 'y' being merged into a single directory 'z', with a
2727
directory rename being detected for both x->z and y->z.

0 commit comments

Comments
 (0)