Merge branch 'jc/maint-am-abort-safely' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:42:55 +0000 (13:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:42:55 +0000 (13:42 -0800)
commit2f73969...700e4a9d9de640ff623fe4e728f5b23a
treeb6f7612...a20097d66a8d55f158f5e3a0dc2cecd3copy hash to clipboard (tree)
parent0ec9ee3...cf5c926df9d54f63ff3ed8b97e19bb0dcopy hash to clipboard (diff)
parent7b3b7e3...581fb5266a260687c21af1571b4ade81copy hash to clipboard (diff)