Fork: 0
Gatewify / GitBucket
Browse code
Merge pull request #1914 from peccu/prevent-parsig-filename-as-md-in-conflict-message
Prevent parsing filename as Markdown in conflict message
patch-3 test 4.31.2 4.31.1 4.31.0 4.30.1 4.30.0 4.29.0 4.28.0 4.27.0 4.26.0 4.25.0 4.24.1 4.24.0 4.23.1 4.23.0 1.0.0
commit 850429c507952e51ea992c1904c22de2b708cca2
2 parents b89c99d + 33812cb
@Naoki Takezoe Naoki Takezoe authored on 19 Mar 2018
GitHub committed on 19 Mar 2018
Patch
Unified Split
Showing 1 changed file
View
src/main/scala/gitbucket/core/service/MergeService.scala