models/pull: better error message detection (#4265)

Stop using English phrases in case of Git localization.

1 files changed, 2 insertions, 5 deletions

diff --git a/models/pull.go b/models/pull.go
index 8e9e0c5d..054d2649 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -331,9 +331,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
 
 // patchConflicts is a list of conflit description from Git.
 var patchConflicts = []string{
-	"patch does not apply",
-	"already exists in working directory",
-	"unrecognized input",
+	"fatal:",
 	"error:",
 }
 
@@ -374,8 +372,7 @@ func (pr *PullRequest) testPatch() (err error) {
 	if err != nil {
 		for i := range patchConflicts {
 			if strings.Contains(stderr, patchConflicts[i]) {
-				log.Trace("PullRequest[%d].testPatch (apply): has conflit", pr.ID)
-				fmt.Println(stderr)
+				log.Trace("PullRequest[%d].testPatch (apply): has conflit\n%s", pr.ID, stderr)
 				pr.Status = PULL_REQUEST_STATUS_CONFLICT
 				return nil
 			}