mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
3fb5680152
Summary: Per wez, this makes the MODIFIED case consistent with the other conflict types (e.g. local_remote). Side benefit of avoiding some naming conflicts in the Haskell/Rust thrift tooling. Reviewed By: wez Differential Revision: D5882327 fbshipit-source-id: 3ec68c44d8c8a5c5675f1ced3842d29376d46fe2 |
||
---|---|---|
.. | ||
config | ||
fuse | ||
inodes | ||
journal | ||
model | ||
rocksdb | ||
service | ||
store | ||
testharness | ||
utils |