Age | Commit message (Expand) | Author |
---|---|---|
2018-03-23 | Fix 500 error when trying to resolve non-ASCII conflicts in editor | Sean McGivern |
2018-01-02 | Simplify conflict resolution interface and code | Alejandro Rodríguez |
2017-12-04 | Add missing attr_accessor to Gitlab::Git::Conflict::File | Alejandro Rodríguez |
2017-10-13 | Move line code generation into Gitlab::Git | Alejandro Rodríguez |
2017-10-13 | Create a Gitlab::Git submodule for conlict-related files | Alejandro Rodríguez |