mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge branch 'en/header-split-cache-h-part-3' into next"

Browse Source 
This reverts commit 76ebce0b7a,
reversing changes made to 62e19d66fb,
in preparation for redoing the topic to make it buildable from the
source.
This commit is contained in:
Junio C Hamano
2023-06-21 13:04:30 -07:00
parent a1a0a3961a
commit deb00029a0
312 changed files with 1895 additions and 2180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/technical/api-merge.txt
View File

@ -28,9 +28,9 @@ and `diff.c` for examples.
* `struct ll_merge_options`
Check merge-ll.h for details.
Check ll-merge.h for details.
Low-level (single file) merge
-----------------------------
Check merge-ll.h for details.
Check ll-merge.h for details.