Merge branch 'fix'
authorJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 22:05:34 +0000 (15:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 2 May 2006 22:05:34 +0000 (15:05 -0700)
* fix:
  git-send-email: fix version string to be valid perl
  Give the user a hint for how to continue in the case that git-am fails because it requires user intervention


Trivial merge