changelogs · 179e3e5b65a460d78dc30258dd19e99d0780fe7f · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

History Find file

Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' · e4261fe3
Douwe Maan authored May 12, 2017
```
Fix conflict resolution from corrupted upstream

Closes gitlab-ee#2128

See merge request !11298
```
e4261fe3

Name	Last commit	Last update
..
unreleased		Loading commit data...
archive.md		Loading commit data...