Merge branch 'jc/rerere-doc-typofix' into jch
A missing preposition in the rerere technical documentation has been fixed. * jc/rerere-doc-typofix: rerere: technical documentation typofixjch
commit
0759fee61b
|
|
@ -77,7 +77,7 @@ Sorting hunks
|
||||||
~~~~~~~~~~~~~
|
~~~~~~~~~~~~~
|
||||||
|
|
||||||
As before, let's imagine that a common ancestor had a file with line A
|
As before, let's imagine that a common ancestor had a file with line A
|
||||||
its early part, and line X in its late part. And then four branches
|
in its early part, and line X in its late part. And then four branches
|
||||||
are forked that do these things:
|
are forked that do these things:
|
||||||
|
|
||||||
- AB: changes A to B
|
- AB: changes A to B
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue