| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Fix merge conflict reading for new diffs | Sean McGivern | 2016-08-12 | 1 | -1/+1 | |
| * | Allow resolving conflicts in MR controller | Sean McGivern | 2016-08-12 | 2 | -1/+63 | |
| * | Handle multiple merge conflict files in collection | Sean McGivern | 2016-08-12 | 3 | -14/+71 | |
| * | Add backend for merge conflicts reading | Sean McGivern | 2016-08-12 | 2 | -0/+150 | |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |