mail.sh: restore "Merge: ..." line for merge commits
commit431a8397e9337e570bc70759eeea326e0cb961f2
authorKyle J. McKay <mackyle@gmail.com>
Mon, 15 Aug 2016 03:52:45 +0000 (14 20:52 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Mon, 15 Aug 2016 03:52:45 +0000 (14 20:52 -0700)
treec1fb2cb34e42b11acc9102cb7daa3460118ddb59
parent93431289b32e2b71c135103a44fc0f8b22683608
mail.sh: restore "Merge: ..." line for merge commits

When the URL was moved into the header of displayed new revisions,
the "Merge: ..." line that's automatically added by --pretty=medium
was inadvertently lost.

Add it back to restore the original formatting.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
taskd/mail.sh