Name	Size	Mode	Actions
api-error-handling.html	22259	0644	editdlrm
api-error-handling.txt	3818	0644	editdlrm
api-index-skel.txt	432	0644	editdlrm
api-index.html	17183	0644	editdlrm
api-index.sh	611	0644	editdlrm
api-index.txt	648	0644	editdlrm
api-merge.html	18305	0644	editdlrm
api-merge.txt	1090	0644	editdlrm
api-parse-options.html	36657	0644	editdlrm
api-parse-options.txt	13157	0644	editdlrm
api-simple-ipc.html	22388	0644	editdlrm
api-simple-ipc.txt	4852	0644	editdlrm
api-trace2.html	77619	0644	editdlrm
api-trace2.txt	44255	0644	editdlrm
bitmap-format.html	30403	0644	editdlrm
bitmap-format.txt	8871	0644	editdlrm
bundle-uri.html	51387	0644	editdlrm
bundle-uri.txt	26787	0644	editdlrm
commit-graph.txt	17957	0644	editdlrm
directory-rename-detection.txt	5199	0644	editdlrm
hash-function-transition.html	64539	0644	editdlrm
hash-function-transition.txt	35894	0644	editdlrm
long-running-process-protocol.html	18995	0644	editdlrm
long-running-process-protocol.txt	1929	0644	editdlrm
multi-pack-index.html	22462	0644	editdlrm
multi-pack-index.txt	4459	0644	editdlrm
pack-heuristics.html	43594	0644	editdlrm
pack-heuristics.txt	18040	0644	editdlrm
packfile-uri.txt	3748	0644	editdlrm
parallel-checkout.html	31715	0644	editdlrm
parallel-checkout.txt	12301	0644	editdlrm
partial-clone.html	36496	0644	editdlrm
partial-clone.txt	14968	0644	editdlrm
racy-git.html	27995	0644	editdlrm
racy-git.txt	9121	0644	editdlrm
reftable.html	73792	0644	editdlrm
reftable.txt	37525	0644	editdlrm
remembering-renames.txt	30360	0644	editdlrm
repository-version.txt	4311	0644	editdlrm
rerere.txt	6510	0644	editdlrm
scalar.html	20458	0644	editdlrm
scalar.txt	2935	0644	editdlrm
send-pack-pipeline.html	19315	0644	editdlrm
send-pack-pipeline.txt	1969	0644	editdlrm
shallow.html	19685	0644	editdlrm
shallow.txt	2548	0644	editdlrm
sparse-checkout.txt	47499	0644	editdlrm
sparse-index.txt	9501	0644	editdlrm
trivial-merge.html	22273	0644	editdlrm
trivial-merge.txt	4264	0644	editdlrm

merge API ========= The merge API helps a program to reconcile two competing sets of improvements to some files (e.g., unregistered changes from the work tree versus changes involved in switching to a new branch), reporting conflicts if found. The library called through this API is responsible for a few things. * determining which trees to merge (recursive ancestor consolidation); * lining up corresponding files in the trees to be merged (rename detection, subtree shifting), reporting edge cases like add/add and rename/rename conflicts to the user; * performing a three-way merge of corresponding files, taking path-specific merge drivers (specified in `.gitattributes`) into account. Data structures --------------- * `mmbuffer_t`, `mmfile_t` These store data usable for use by the xdiff backend, for writing and for reading, respectively. See `xdiff/xdiff.h` for the definitions and `diff.c` for examples. * `struct ll_merge_options` Check merge-ll.h for details. Low-level (single file) merge ----------------------------- Check merge-ll.h for details.