| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Force source and target branch to binary modesh-fix-utf-8-encoding-resolve-conflicts | Stan Hu | 2019-06-10 | 1 | -8/+15 |
| * | Fix UTF-8 conversion issues when resolving conflicts | Stan Hu | 2019-06-10 | 1 | -1/+13 |
| * | Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitaly | Ahmad Sherif | 2018-01-11 | 1 | -31/+2 |
| * | Simplify conflict resolution interface and codegitaly-conflict-resolver | Alejandro Rodríguez | 2018-01-02 | 1 | -1/+4 |
| * | Incorporate ConflictsService.ResolveConflicts Gitaly RPC | Alejandro Rodríguez | 2017-12-27 | 1 | -7/+36 |
| * | Incorporate ConflictsService.ListConflictFiles Gitaly RPC | Alejandro Rodríguez | 2017-12-27 | 1 | -0/+58 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |