mirror of
https://github.com/facebook/sapling.git
synced 2024-10-04 13:57:13 +03:00
ca8cb8ba67
Add simple transaction support Add hg verify Improve caching in revlog Fix a bunch of bugs Self-hosting now that the metadata is close to finalized
3 lines
45 B
Plaintext
3 lines
45 B
Plaintext
merge $1 $3 $2 || tkdiff -conflict $1 -o $1
|
|
|