summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-173-0/+41
|\
| * Reference the version 'UI resolve conflicts' was introducedAchilleas Pipinellis2016-08-171-0/+4
| * Add merge conflict docsSean McGivern2016-08-123-0/+37
* Add documentation for discussion resolution.Connor Shea2016-08-166-8/+40
* Init commit on documentation for resolving inline comments in MRsAchilleas Pipinellis2016-08-171-0/+8