diff options
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index e680480978..bdbe4b3a98 100644 --- a/models/pull.go +++ b/models/pull.go @@ -275,7 +275,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error tmpBasePath := path.Join(setting.AppDataPath, "tmp/repos", com.ToStr(time.Now().Nanosecond())+".git") if err := os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm); err != nil { - return fmt.Errorf("Fail to create dir %s: %v", tmpBasePath, err) + return fmt.Errorf("Failed to create dir %s: %v", tmpBasePath, err) } defer os.RemoveAll(path.Dir(tmpBasePath)) |