summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests/img/merge_conflict_editor.png
Commit message (Expand)AuthorAgeFilesLines
* Compress all PNG images under doc/Achilleas Pipinellis2018-08-271-0/+0
* Add docs for resolve conflicts editorAchilleas Pipinellis2017-01-241-0/+0