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)
commit782b3b6aafe8d2d270a5f6153c183e1bde7a030a
tree756b33d9c53a35150bcdd832c6f03243e5e48af0
parentc1aee1fd8d94da9b3c5d2dc1d4264f7e73a58f80
parente923effb43fa952f9cb72ffe4c3625fce7655bff
Merge branch 'fix'

* 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