Find file
Fetching contributors…
Cannot retrieve contributors at this time
9 lines (8 sloc) 311 Bytes
- Add a test suite
- Trivial conflicted merge
- user A merges, pushes, user B merges
- user A merges, resolves, pushes, user B merges
- handling of typechange conflicts
- Weird cases for handling of extensions
- Fix handling of typechange conflicts
- Fix handling when the (conflicted) name already exists