Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
I need to stop using the browser for merge conflicts
- Loading branch information
I need to stop using the browser for merge conflicts