| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8 | Sean McGivern | 2017-03-15 | 1 | -30/+59 |
| * | Fix merge conflict size limitfix-allowed-conflict-size | Sean McGivern | 2016-09-07 | 1 | -2/+2 |
| * | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-data | Sean McGivern | 2016-08-25 | 1 | -0/+5 |
| * | Raise errors for large and binary files | Sean McGivern | 2016-08-12 | 1 | -9/+17 |
| * | Handle multiple merge conflict files in collection | Sean McGivern | 2016-08-12 | 1 | -4/+6 |
| * | Add backend for merge conflicts reading | Sean McGivern | 2016-08-12 | 1 | -0/+178 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |