]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/maint-am-keep' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:54:03 +0000 (13:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Dec 2009 21:54:03 +0000 (13:54 -0800)
* jc/maint-am-keep:
  Remove dead code from "git am"

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge