mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 09:48:05 +03:00
1f8da72664
Summary: This diff handles a tricky case of merging two files with the same content but different histories. See code comment for more details. Reviewed By: krallin Differential Revision: D16360117 fbshipit-source-id: 9a21473d49b63b7914e72357da63adcc35f5b612 |
||
---|---|---|
.. | ||
derive_unode_manifest | ||
src |