andras/reconcile
1
0
Fork 0
Code Issues Pull requests 5 Projects Releases Packages Wiki Activity Actions

Add example

Browse source
This commit is contained in:
Andras Schmelczer 2026-03-11 21:04:55 +00:00
parent 545be141d8
commit 92e0697b05
4 changed files with 90 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/advanced-python.md
View file

@ -86,3 +86,7 @@ assert reconstructed == changed
```
Diff entries are positive integers (retain N characters), negative integers (delete N characters), and strings (insert text).
## File Merging Example
For a complete file-merging CLI (a trivial `git merge-file`), see [`examples/merge_file.py`](../examples/merge_file.py).