Merge branch 'jramsay/improve-resolve-conflicts-docs' into 'master'
Improve detail of resolve conflict docs See merge request gitlab-org/gitlab-ce!22927
Showing
![doc/user/project/merge_requests/img/merge_request_widget.png](https://lab.nexedi.com/nexedi/gitlab-ce/-/raw/62488fe2fc035aa62520de45b8cac1b5a4113f43/doc/user/project/merge_requests/img/merge_request_widget.png)
Improve detail of resolve conflict docs See merge request gitlab-org/gitlab-ce!22927
10.8 KB | W: | H:
8.73 KB | W: | H: