Merge branch 'rt/cherry-pick-status'
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 14 Oct 2013 18:08:47 +0000 (14 11:08 -0700)
committerJonathan Nieder <jrnieder@gmail.com>
Mon, 14 Oct 2013 18:08:47 +0000 (14 11:08 -0700)
* rt/cherry-pick-status:
  status: show commit sha1 in "You are currently cherry-picking" message
  status test: add missing && to <<EOF blocks


Trivial merge