Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Simplify conflict resolver interfacegitaly-conflicts-prep | Alejandro Rodríguez | 2017-12-14 | 1 | -30/+29 |
* | Use `String#end_with?` instead of `String#ends_with?`gitaly-conflict-file | Alejandro Rodríguez | 2017-12-04 | 1 | -1/+1 |
* | Create a Gitlab::Git submodule for conlict-related files | Alejandro Rodríguez | 2017-10-12 | 1 | -0/+91 |