Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ability to resolve conflicts for files with `text-editor` as conflict type | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |
* | Implement editor to manually resolve merge conflicts | Alfredo Sumaran | 2016-10-13 | 1 | -0/+12 |
index : delta/gitlab/gitlab-ce.git | ||
gitlab.com: gitlab-org/gitlab-ce.git |
summaryrefslogtreecommitdiff |
Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Ability to resolve conflicts for files with `text-editor` as conflict type | Alfredo Sumaran | 2016-10-13 | 1 | -1/+1 |
* | Implement editor to manually resolve merge conflicts | Alfredo Sumaran | 2016-10-13 | 1 | -0/+12 |