Age | Commit message (Expand) | Author |
---|---|---|
2016-08-12 | Raise errors for large and binary files | Sean McGivern |
2016-08-12 | Handle conflict resolution errors in controller | Sean McGivern |
2016-08-12 | Fix MR conflict resolution commits | Sean McGivern |
2016-08-12 | Auto-highlight conflict when rich_text is called | Sean McGivern |
2016-08-12 | Fix merge conflict reading for new diffs | Sean McGivern |
2016-08-12 | Allow resolving conflicts in MR controller | Sean McGivern |
2016-08-12 | Handle multiple merge conflict files in collection | Sean McGivern |
2016-08-12 | Add backend for merge conflicts reading | Sean McGivern |