Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add file conflict detection to list of features
This has been supported for a long time but was never called out on the README.
- Loading branch information