aboutsummaryrefslogtreecommitdiffstats
path: root/commands/pull.go
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2018-09-13 11:13:51 +0200
committerMichael Muré <batolettre@gmail.com>2018-09-13 11:13:51 +0200
commit19f43a83c3925ed3d05a4874dcbc84cbb454ea6c (patch)
tree3a1d595a7da57a89f46c595e46aafadaaa198425 /commands/pull.go
parent27c5ea5b5b57887f51d5700398ee283dc191fff9 (diff)
downloadgit-bug-19f43a83c3925ed3d05a4874dcbc84cbb454ea6c.tar.gz
bug: proper int baked enum for merge result status instead of a string
Diffstat (limited to 'commands/pull.go')
-rw-r--r--commands/pull.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/commands/pull.go b/commands/pull.go
index 9a5f4e5c..64de8bf5 100644
--- a/commands/pull.go
+++ b/commands/pull.go
@@ -41,7 +41,7 @@ func runPull(cmd *cobra.Command, args []string) error {
return merge.Err
}
- if merge.Status != bug.MsgMergeNothing {
+ if merge.Status != bug.MergeStatusNothing {
fmt.Printf("%s: %s\n", merge.Bug.HumanId(), merge.Status)
}
}