aboutsummaryrefslogtreecommitdiff
path: root/git-codereview/mail.go
diff options
context:
space:
mode:
Diffstat (limited to 'git-codereview/mail.go')
-rw-r--r--git-codereview/mail.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-codereview/mail.go b/git-codereview/mail.go
index 55ab8ed..3b60eb3 100644
--- a/git-codereview/mail.go
+++ b/git-codereview/mail.go
@@ -59,7 +59,7 @@ func cmdMail(args []string) {
return
}
- if len(ListFiles(c)) == 0 {
+ if len(ListFiles(c)) == 0 && c.Merge == "" {
dief("cannot mail: commit %s is empty", c.ShortHash)
}