set filename in conflict message as code

Fork: 0

Gatewify / GitBucket

Browse code set filename in conflict message as code 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
1 parent b89c99d commit 33812cb3370b34aee723ad77626f101df54f77b5 peccu authored on 17 Mar 2018

Patch

Unified Split

Showing 1 changed file

Ignore Space Show notes View src/main/scala/gitbucket/core/service/MergeService.scala

Show line notes below