merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
|
@ -189,7 +189,7 @@ diff.guitool::
|
|||
include::../mergetools-diff.txt[]
|
||||
|
||||
diff.indentHeuristic::
|
||||
Set this option to `true` to enable experimental heuristics
|
||||
Set this option to `false` to disable the default heuristics
|
||||
that shift diff hunk boundaries to make patches easier to read.
|
||||
|
||||
diff.algorithm::
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue